Update.

1997-05-29 12:48  Ulrich Drepper  <drepper@cygnus.com>

	* io/ftw.c: Complete rewrite.  Add implementation of `nftw'.
	* io/ftw.h: Update for new implementation and XPG4.2.

	* login/Makefile: Update for UTMP daemon implementation.

	Update resolver code to bind-4.9.6-T1A.
	* resolv/Banner: Update.
	* nss/digits_dots.c: Adapt text address matching to T1A.
	* nss/nss_files/files-hosts.c: Always use inet_pton.
	* resolv/base64.c (b64_pton): Follow T1A but don't use this code since
	it would lead to warnings.
	* resolv/gethnamaddr.c (getanswer): Test host name for maximal length
	at several places.
	* resolv/inet_net_pton.c (inet_net_pton_ipv4): Correct typo in comment.
	* resolv/res_comp.c (dn_expand): Check for overflow.
	(dn_comp): Likewise.
	* resolv/res_debug.c (precsize_aton): Better implementation.
	* resolv/res_init.c (res_init): Make `buf' of size MAXDNAME.
	* resolv/res_send.c (res_send): Check for overflow in descriptor set.
	* resolv/nss_dns/dns-host.c (getanswer_r): Test host name for maximal
	length at several places.

1997-05-29 12:51  Mark Kettenis  <kettenis@phys.uva.nl>

	* login/utmp-private.h (struct utfuncs): Add one more parameter
	to updwtmp function.
	Declare all three function jump tables.
	* login/utmp.h: Declare __utmpname.
	* login/getutent_r.c: Remove db backend and provide support for
	utmpd backend.
	* login/login.c: Use `updwtmp' function insteead of writing the
	record ourself.
	* login/logwtmp.c: Move `updwtmp' function to...
	* login/updwtmp.c: ...here.  New file.
	* login/utmp_db.h: Removed.
	* login/utmp_file.c: Add updwtmp function to write to file.
	* login/utmp_daemon.c: New file.  Daemon backend.
	* login/utmpname.c: New file.  Implementation of utmpname function.
	* login/utmpdump.c: New file.  Tool to dump utmp-like files.
	* login/utmpd/connection.c: New file.
	* login/utmpd/database.c: New file.
	* login/utmpd/error.c: New file.
	* login/utmpd/request.c: New file.
	* login/utmpd/utmpd-private.h: New file.
	* login/utmpd/utmpd.c: New file.
	* login/utmpd/utmpd.h: New file.
	* login/utmpd/xtmp.c: New file.
	* login/utmpd/xtmp.h: New file.

1997-05-29 12:28  Jim Meyering  <meyering@eng.ascend.com>

	* time/strftime.c: Correct/normalize indentation in cpp directives.

1997-05-28 20:43  Philip Blundell  <pjb27@cam.ac.uk>

	* nis/nis_error.c: Include <string.h> to fix warning.
	* nis/nis_print.c: Likewise.
	* nis/nss_nisplus/nisplus-hosts.c: Arg 3 of map_v4v6_hostent
	is int* not size_t*.

1997-05-28 21:56  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* math/cmathcalls.h: Correct typo in comment.

	* inet/netinet/icmp6.h: Include <netinet/in.h> for in6_addr.

	* sysdeps/unix/sysv/linux/netinet/ip_fw.h: Include <net/if.h> for
	IFNAMSIZ.

	* sysdeps/unix/sysv/linux/net/ppp_defs.h: Include <time.h> for
	time_t.

	* login/pty.h: Include <ioctl-types.h> for definition of struct
	winsize.

	* misc/regexp.h (compile): Correct typo.

	* argp/argp.h: Put extern before __const in defintion of
	argp_program_bug_address.

1997-05-29 00:20  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/wordsize-32/inttypes.h: Correct names of unsigned fast
	and least types.  Correct names of ?INT_FAST*_{MIN,MAX} macros.
	* sysdeps/wordsize-64/inttypes.h: Likewise.
	Reported by Andreas Jaeger <aj@arthur.rhein-neckar.de>.

1997-05-28 22:51  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/unix/Makefile (make-ioctls-CFLAGS): Use generic
	ttydefaults.h file instead of non-existing version in termios/sys.
	Reported by Zack Weinberg <zack@rabi.phys.columbia.edu>.

	* time/strptime.c (strptime_internal, case 'Y'): Restrict year
	number to four digits and to representable range for 4 byte time_t
	values.
	Patch by H.J. Lu <hjl@lucon.org>.

1997-05-28 18:19  Philip Blundell  <pjb27@cam.ac.uk>

	* posix/execl.c: Include <alloca.h> to avoid warning.

1997-05-27 18:19  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* math/libm-test.c: Implement testing of inlined functions, make
	output nicer, update comments.

	* math/test-idouble.c: New file.  Frontend for double tests of
	inlined functions.
	* math/test-ildoubl.c: New file.  Frontend for long double tests of
	inlined functions.
	* math/test-ifloat.c: New file.  Frontend for float tests of
	inlined functions.

	* math/test-longdouble.c: Rename to...
	* math/test-ldouble.c: ...this.

	* math/Makefile: Add rules for new test programs, change rules for
	renaming of longdouble test.

1997-05-20 15:50  H.J. Lu  <hjl@gnu.ai.mit.edu>

	* sunrpc/rpc/svc.h (__dispatch_fn_t): New.
	(svc_register): Use __dispatch_fn_t in prototype.

1997-05-28 17:02  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/generic/bzero.c (bzero): Fix typo.
	Patch by Witek Wnuk <spider@pest.waw.ids.edu.pl>.

1997-05-27 12:00  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* sysdeps/generic/vtimes.c: Use ISO C declaration style.

	* sysdeps/unix/bsd/ualarm.c: Include <unistd.h> for prototype.

	* sysdeps/generic/memccpy.c: Include <string.h> for prototype.

	* signal/tst-signal.c (handler): Correct function declaration to
	avoid warning.
	* stdlib/testsort.c (compare): Likewise.
	* string/tester.c: Likewise.

1997-05-27 14:16  Miles Bader  <miles@gnu.ai.mit.edu>

	* argp-help.c (argp_args_usage): Supply correct argp to filter_doc.

1997-05-27 17:51  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* db/hash/extern.h, db/hash/hash.c, db/hash/hash.h,
	db/hash/hash_log2.c: Rename __log2 to __hash_log2 to avoid clash
	with libm.

1997-05-27 14:47  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* sysdeps/m68k/fpu/e_atan2.c: Fix missing negate.  Use __m81_test
	instead of explicit comparisons.

1997-05-26 18:36  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* inet/netinet/icmp6.h: Remove use of <asm/bitops.h> which has no
	place in a generic header and is no user include file.

1 files changed, 44 insertions, 69 deletions

diff --git a/login/getutent_r.c b/login/getutent_r.c
index 580dcffb21..3cc46da96c 100644
--- a/login/getutent_r.c
+++ b/login/getutent_r.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>
    and Paul Janzen <pcj@primenet.com>, 1996.
@@ -19,49 +19,48 @@
    Boston, MA 02111-1307, USA.  */
 
 #include <assert.h>
-#include <db.h>
-#include <fcntl.h>
+#if _LIBC
 #include <libc-lock.h>
-#include <limits.h>
+#else
+#define __libc_lock_lock(lock)		((void) 0)
+#define __libc_lock_unlock(lock)	((void) 0)
+#define __libc_lock_define_initialized(CLASS,NAME)
+#define weak_alias(name, aliasname) \
+  extern __typeof (name) aliasname __attribute__ ((weak, alias (#name))); 
+#endif
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 #include <utmp.h>
-#include <sys/stat.h>
 
 #include "utmp-private.h"
 
 
 /* The various backends we have.  */
-static int __setutent_unknown (int reset);
-static int __getutent_r_unknown (struct utmp *buffer, struct utmp **result);
-static struct utmp *__pututline_unknown (const struct utmp *data);
-static void __endutent_unknown (void);
+static int setutent_unknown (int reset);
+static int getutent_r_unknown (struct utmp *buffer, struct utmp **result);
+static struct utmp *pututline_unknown (const struct utmp *data);
+static void endutent_unknown (void);
 
-
-/* We have three jump tables: unknown, db, or file.  */
-static struct utfuncs unknown_functions =
+/* Initial Jump table.  */
+struct utfuncs __libc_utmp_unknown_functions =
 {
-  __setutent_unknown,
-  __getutent_r_unknown,
+  setutent_unknown,
+  getutent_r_unknown,
   NULL,
   NULL,
-  __pututline_unknown,
-  __endutent_unknown,
+  pututline_unknown,
+  endutent_unknown,
   NULL
 };
 
 /* Currently selected backend.  */
-struct utfuncs *__libc_utmp_jump_table = &unknown_functions;
-
-/* The tables from the services.  */
-extern struct utfuncs __libc_utmp_db_functions;
-extern struct utfuncs __libc_utmp_file_functions;
-
+struct utfuncs *__libc_utmp_jump_table = &__libc_utmp_unknown_functions;
 
 /* We need to protect the opening of the file.  */
 __libc_lock_define_initialized (, __libc_utmp_lock)
 
+     
 void
 __setutent (void)
 {
@@ -75,22 +74,31 @@ weak_alias (__setutent, setutent)
 
 
 static int
-__setutent_unknown (int reset)
+setutent_unknown (int reset)
 {
   /* We have to test whether it is still not decided which backend to use.  */
-  assert (__libc_utmp_jump_table == &unknown_functions);
+  assert (__libc_utmp_jump_table == &__libc_utmp_unknown_functions);
 
-  /* See whether utmp db file exists.  */
-  if ((*__libc_utmp_db_functions.setutent) (reset))
-    __libc_utmp_jump_table = &__libc_utmp_db_functions;
+  /* See whether utmpd is running.  */
+  if ((*__libc_utmp_daemon_functions.setutent) (reset))
+    __libc_utmp_jump_table = &__libc_utmp_daemon_functions;
   else
     {
-      /* Either the db file does not exist or we have other
-	 problems.  So use the normal file.  */
+      /* Use the normal file, but if the current file is _PATH_UTMP or
+         _PATH_WTMP and the corresponding extended file (with an extra
+         'x' added to the pathname) exists, we use the extended file,
+         because the original file is in a different format.  */
+      if (strcmp (__libc_utmp_file_name, _PATH_UTMP) == 0
+	  && __access (_PATH_UTMP "x", F_OK) == 0)
+	__utmpname (_PATH_UTMP "x");
+      else if (strcmp (__libc_utmp_file_name, _PATH_WTMP) == 0
+	       && __access (_PATH_WTMP "x", F_OK) == 0)
+	__utmpname (_PATH_WTMP "x");
+
       (*__libc_utmp_file_functions.setutent) (reset);
       __libc_utmp_jump_table = &__libc_utmp_file_functions;
     }
-
+  
   return 0;
 }
 
@@ -108,7 +116,7 @@ weak_alias (__endutent, endutent)
 
 
 static void
-__endutent_unknown (void)
+endutent_unknown (void)
 {
   /* Huh, how do we came here?  Nothing to do.  */
 }
@@ -131,10 +139,10 @@ weak_alias (__getutent_r, getutent_r)
 
 
 static int
-__getutent_r_unknown (struct utmp *buffer, struct utmp **result)
+getutent_r_unknown (struct utmp *buffer, struct utmp **result)
 {
   /* It is not yet initialized.  */
-  __setutent_unknown (0);
+  setutent_unknown (0);
 
   return (*__libc_utmp_jump_table->getutent_r) (buffer, result);
 }
@@ -157,43 +165,10 @@ weak_alias (__pututline, pututline)
 
 
 static struct utmp *
-__pututline_unknown (const struct utmp *data)
+pututline_unknown (const struct utmp *data)
 {
   /* It is not yet initialized.  */
-  __setutent_unknown (0);
+  setutent_unknown (0);
 
   return (*__libc_utmp_jump_table->pututline) (data);
 }
-
-
-int
-__utmpname (const char *file)
-{
-  int result = -1;
-
-  __libc_lock_lock (__libc_utmp_lock);
-
-  /* Close the old file.  */
-  (*__libc_utmp_jump_table->endutent) ();
-
-  /* Store new names.  */
-  if ((*__libc_utmp_file_functions.utmpname) (file) == 0
-      && !(*__libc_utmp_db_functions.utmpname) (file) == 0)
-    {
-      /* Try to find out whether we are supposed to work with a db
-	 file or not.  Do this by looking for the extension ".db".  */
-      const char *ext = strrchr (file, '.');
-
-      if (ext != NULL && strcmp (ext, ".db") == 0)
-	__libc_utmp_jump_table = &__libc_utmp_db_functions;
-      else
-	__libc_utmp_jump_table = &unknown_functions;
-
-      result = 0;
-    }
-
-  __libc_lock_unlock (__libc_utmp_lock);
-
-  return result;
-}
-weak_alias (__utmpname, utmpname)