Wed Jun 26 01:58:49 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>

	* nss/nss_files/files-parse.c (parse_list): Count null in EOL calc.

	Move DB code into separate -ldb library.
	* db/Makefile (extra-libs): New variable, list libdb.
	(routines): Renamed to libdb-routines.
	* shlib-versions: Add libdb=2.

	* nss/network-lookup.c (DEFAULT_CONFIG): New macro.
	* nss/host-lookup.c (DEFAULT_CONFIG): New macro.

	* nss/nsswitch.c (nss_parse_service_list): Use __strncasecmp instead
	of strncasecmp.  Extend syntax to grok [!foo=bar].

	* sysdeps/generic/strncase.c: Define __strncasecmp with strncasecmp as
	weak alias.
	* string/string.h: Declare __strncasecmp.

	* nss/nsswitch.c (nss_parse_file): Call __getline, not getline.
	(service_alias): Variable removed.
	(nss_parse_service_list): New function, broken out of nss_getline.
	Remove alias conversion; we will just use symlinks.
	(__nss_database_lookup): Take new string arg DEFCONFIG.
	If no entry exists, make one with service list parsed from that.
	* nss/nsswitch.h: Update protocol for __nss_database_lookup.
	* nss/XXX-lookup.c (DEFAULT_CONFIG): New macro, set to 0 if undefined.
	(DB_LOOKUP_FCT): Pass it to _nss_database_lookup.

	* grp/initgroups.c: Rewritten using getgrent.  Handle unlimited group
	list size.

	* sunrpc/xdr.c (xdr_int): #if 0 out unresolved references in dead code.

Wed Jun 26 01:56:50 1996  Ulrich Drepper  <drepper@cygnus.com>

	* locale/programs/locale.c (long_options): Short form of
	--version option is `-V'.
	(main): Recognize `-V' as option, not `-v'.
	Call `usage' instead of printing error message for illegal
	option.
	(usage): Document `-V'.

1 files changed, 45 insertions, 22 deletions

diff --git a/grp/initgroups.c b/grp/initgroups.c
index 5af1926..a700557 100644
--- a/grp/initgroups.c
+++ b/grp/initgroups.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1989, 1991, 1993 Free Software Foundation, Inc.
+/* Copyright (C) 1989, 1991, 1993, 1996 Free Software Foundation, Inc.
 This file is part of the GNU C Library.
 
 The GNU C Library is free software; you can redistribute it and/or
@@ -31,43 +31,66 @@ int
 DEFUN(initgroups, (user, group),
       CONST char *user AND gid_t group)
 {
-#ifdef NGROUPS_MAX
-#if NGROUPS_MAX == 0
+#if defined (NGROUPS_MAX) && NGROUPS_MAX == 0
+
+  /* No extra groups allowed.  */
   return 0;
+
 #else
-  static PTR info = NULL;
-  register FILE *stream;
-  register struct group *g;
-  gid_t groups[NGROUPS_MAX];
+
+  struct group *g;
   register size_t n;
+#ifdef NGROUPS_MAX
+  gid_t groups[NGROUPS_MAX];
+#else
+  long int limit = sysconf (_SC_NGROUPS_MAX);
+  gid_t *groups;
+  size_t ngroups;
 
-  if (info == NULL)
-    {
-      info = __grpalloc();
-      if (info == NULL)
-	return -1;
-    }
+  if (limit > 0)
+    ngroups = limit;
+  else
+    /* No fixed limit on groups.  Pick a starting buffer size.  */
+    ngroups = 16;
 
-  stream = __grpopen();
-  if (stream == NULL)
-    return -1;
+  groups = __alloca (ngroups * sizeof *groups);
+#endif
+
+  setgrent ();
 
   n = 0;
   groups[n++] = group;
 
-  while (n < NGROUPS_MAX && (g = __grpread(stream, info)) != NULL)
+  while ((g = getgrent ()) != NULL)
     if (g->gr_gid != group)
       {
 	register char **m;
 
 	for (m = g->gr_mem; *m != NULL; ++m)
-	  if (!strcmp(*m, user))
+	  if (!strcmp (*m, user))
+	    break;
+
+	if (*m == NULL)
+	  {
+	    /* Matched the user.  Insert this group.  */
+	    if (n == ngroups && limit <= 0)
+	      {
+		/* Need a bigger buffer.  */
+		groups = memcpy (__alloca (ngroups * 2 * sizeof *groups),
+				 groups, ngroups * sizeof *groups);
+		ngroups *= 2;
+	      }
+
 	    groups[n++] = g->gr_gid;
+
+	    if (n == limit)
+	      /* Can't take any more groups; stop searching.  */
+	      break;
+	  }
       }
 
-  return setgroups(n, groups);
-#endif
-#else
-  return 0;
+  endgrent ();
+
+  return setgroups (n, groups);
 #endif
 }