Tim Waugh c3e4c8
--- coreutils-5.92/m4/jm-macros.m4.getgrouplist	2005-09-25 06:57:46.000000000 +0100
Tim Waugh c3e4c8
+++ coreutils-5.92/m4/jm-macros.m4	2005-10-25 14:28:45.000000000 +0100
Tim Waugh c3e4c8
@@ -105,6 +105,7 @@
Tim Waugh c3e4c8
     fchmod \
Tim Waugh c3e4c8
     fchown \
Tim Waugh 0b3fe5
     ftruncate \
Tim Waugh 0b3fe5
+    getgrouplist \
Tim Waugh 0b3fe5
     hasmntopt \
Tim Waugh 0b3fe5
     isascii \
Tim Waugh c3e4c8
     iswspace \
Tim Waugh c3e4c8
--- coreutils-5.92/lib/getugroups.c.getgrouplist	2005-09-22 07:47:18.000000000 +0100
Tim Waugh c3e4c8
+++ coreutils-5.92/lib/getugroups.c	2005-10-25 14:28:02.000000000 +0100
Tim Waugh c3e4c8
@@ -23,6 +23,9 @@
Tim Waugh 0b3fe5
 # include <config.h>
Tim Waugh 0b3fe5
 #endif
Tim Waugh 0b3fe5
 
Tim Waugh 0b3fe5
+/* We do not need this code if getgrouplist(3) is available.  */
Tim Waugh 0b3fe5
+#ifndef HAVE_GETGROUPLIST
Tim Waugh 0b3fe5
+
Tim Waugh 0b3fe5
 #include <sys/types.h>
Tim Waugh 0b3fe5
 #include <stdio.h> /* grp.h on alpha OSF1 V2.0 uses "FILE *". */
Tim Waugh 0b3fe5
 #include <grp.h>
Tim Waugh c3e4c8
@@ -105,3 +108,4 @@
Tim Waugh 0b3fe5
 
Tim Waugh 0b3fe5
   return count;
Tim Waugh 0b3fe5
 }
Tim Waugh 0b3fe5
+#endif	/* have getgrouplist */
Tim Waugh c3e4c8
--- coreutils-5.92/src/id.c.getgrouplist	2005-08-11 22:02:57.000000000 +0100
Tim Waugh c3e4c8
+++ coreutils-5.92/src/id.c	2005-10-25 14:30:41.000000000 +0100
Tim Waugh c3e4c8
@@ -253,7 +253,14 @@
Tim Waugh c3e4c8
   if (!username)
Tim Waugh 0b3fe5
     max_n_groups = getgroups (0, NULL);
Tim Waugh 0b3fe5
   else
Tim Waugh 0b3fe5
-    max_n_groups = getugroups (0, NULL, username, gid);
Tim Waugh 0b3fe5
+    {
Tim Waugh 0b3fe5
+#ifdef HAVE_GETGROUPLIST
Tim Waugh 0b3fe5
+      max_n_groups = 0;
Tim Waugh 0b3fe5
+      getgrouplist (username, gid, NULL, &max_n_groups);
Tim Waugh 0b3fe5
+#else
Tim Waugh 0b3fe5
+      max_n_groups = getugroups (0, NULL, username, gid);
Tim Waugh 0b3fe5
+#endif
Tim Waugh 0b3fe5
+    }
Tim Waugh 0b3fe5
 
Tim Waugh c3e4c8
   if (max_n_groups < 0)
Tim Waugh c3e4c8
     ng = -1;
Tim Waugh c3e4c8
@@ -263,7 +270,22 @@
Tim Waugh c3e4c8
       if (!username)
Tim Waugh c3e4c8
 	ng = getgroups (max_n_groups, g);
Tim Waugh c3e4c8
       else
Tim Waugh c3e4c8
-	ng = getugroups (max_n_groups, g, username, gid);
Tim Waugh 0b3fe5
+	{
Tim Waugh c3e4c8
+#ifdef HAVE_GETGROUPLIST
Tim Waugh c3e4c8
+	  int e;
Tim Waugh c3e4c8
+	  ng = max_n_groups;
Tim Waugh c3e4c8
+	  while ((e = getgrouplist (username, gid, g, &ng)) == -1
Tim Waugh c3e4c8
+		 && ng > max_n_groups)
Tim Waugh c3e4c8
+	    {
Tim Waugh c3e4c8
+	      max_n_groups = ng;
Tim Waugh c3e4c8
+	      g = xrealloc (g, max_n_groups * sizeof (GETGROUPS_T));
Tim Waugh c3e4c8
+	    }
Tim Waugh c3e4c8
+	  if (e == -1)
Tim Waugh c3e4c8
+	    ng = -1;
Tim Waugh 0b3fe5
+#else
Tim Waugh c3e4c8
+	  ng = getugroups (max_n_groups, g, username, gid);
Tim Waugh 0b3fe5
+#endif
Tim Waugh c3e4c8
+	}
Tim Waugh c3e4c8
     }
Tim Waugh 0b3fe5
 
Tim Waugh 0b3fe5
   if (ng < 0)