update from main archive 961220 cvs/libc-961229 cvs/libc-961228 cvs/libc-961227 cvs/libc-961226 cvs/libc-961225 cvs/libc-961224 cvs/libc-961223 cvs/libc-961222

Sun Dec 22 00:01:27 1996  Ulrich Drepper  <drepper@cygnus.com>

	* inet/getnetgrent.c: Reformat copyright.

	* inet/getnetgrent_r.c (__internal_endnetgrent): Correct comment.
	(__internal_getnetgrent): Rename to __internal_getnetgrent_r as
	required in change nis/nss_compat/* at Thu Dec 19 14:24:50 1996.
	Reported by Thorsten Kukuk <kukuk@weber.uni-paderborn.de>.

	* nss/nss_files/files-netgrp.c: Fix typo.
	* login/utmp_db.c: Comment out unused variables.
	* misc/tst-dirname.c: Provide prototype for main (for now).
	* new-malloc/mcheck-init.c: Include <mcheck.h>.
	* new-malloc/obstack.c: Provide real prototypes.

	* resolv/base64.c (b64_ntop): Use size_t as type of `i', not int.
	(b64_pton): Likewise for `tarindex'.
	* resolv/nsap_addr.c (inet_nsap_addr): Add cast to prevent warning.

	* stdio-common/Makefile: Add CFLAGS-vfprintf.c to prevent warning.
	* stdio-common/printf-parse.h: Remove definition of MIN and MAX.
	* stdio-common/printf-prs.c: Include <sys/param.h> to get MIN and MAX.
	* stdio-common/vfprintf.c: Likewise.
	* stdlib/gmp-impl.h: Only define MIN and MAX if not already done.
	* stdlib/tst-strtol.c: Don't use -2147483648 as unsigned long value.

	* sysdeps/generic/Makefile ($(subdir)=string): Define
	CFLAGS-wordcopy.c to prevent warning.
	* sysdeps/generic/mul_n.c (mpn_mul_n): Don't define as inline.
	* sysdeps/generic/wordcopy.c: De-ANSI-declfy.
	* sysdeps/i386/Makefile ($(subdir)=elf): Define CFLAGS-rtld.c
	to prevent warning.
	* sysdeps/i386/dl-machine.h: Correct copyright.
	* sysdeps/unix/closedir.c: Likewise.
	* sysdeps/unix/dirstream.h: Likewise.
	* sysdeps/unix/opendir.c: Likewise.
	* time/tzset.c: Add prototype for __tzset_internal.

	* sysdeps/gnu/utmpbits.h (enum utlogin): Comment out since the
	way it is supposed to work is not yet known.
	(struct utmp): Remove ut_login and ut_syslen field for now.

Sat Dec 21 16:23:54 1996  Ulrich Drepper  <drepper@cygnus.com>

	* time/strftime.c: Fix another bug in handling flags made it
	impossible to use the `-', `_', or `0' flag.

1 files changed, 6 insertions, 3 deletions

diff --git a/sysdeps/gnu/utmpbits.h b/sysdeps/gnu/utmpbits.h
index 4ba3a19960..9fcc77de6b 100644
--- a/sysdeps/gnu/utmpbits.h
+++ b/sysdeps/gnu/utmpbits.h
@@ -53,6 +53,10 @@ struct lastlog
 };
 
 
+/* XXX We are not ready to use this now.  It needs some more research.
+   Simly copying the behaviour of other implementations is no big
+   help.  */
+#if 0
 /* Which program created the record.  */
 enum utlogin
 {
@@ -68,6 +72,7 @@ enum utlogin
   xterm
   /* More could be added here.  */
 };
+#endif
 
 
 struct exit_status
@@ -91,9 +96,7 @@ struct utmp
   long ut_session;		/* Session ID, used for windowing.  */
   struct timeval ut_tv;		/* Time entry was made.  */
   int32_t ut_addr_v6[4];	/* Internet address of remote host.  */
-  enum utlogin ut_login;	/* To store information about source.  */
-  short int ut_syslen;		/* Significant length of ut_host.  */
-  char pad[14];			/* Reserved for future use.  */
+  char pad[18];			/* Reserved for future use.  */
 };
 
 /* Backwards compatibility hacks.  */