X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fgetugroups.c;h=44aeb809cbbf529ea84d039c12a4d374df24a69f;hb=54c26afcfef8e232fbe34b601d7459bab899b2b5;hp=d76517cfc6ab8eec1faa1f27c2f97cff4a188ad6;hpb=b7b9b901fe19fc9817675762ee1318b9fe78484e;p=gnulib.git

diff --git a/lib/getugroups.c b/lib/getugroups.c
index d76517cfc..44aeb809c 100644
--- a/lib/getugroups.c
+++ b/lib/getugroups.c
@@ -41,8 +41,14 @@ struct group *getgrent ();
 # include <strings.h>
 #endif
 
-/* Like `getgroups', but for user USERNAME instead of for
-   the current process. */
+#define STREQ(s1, s2) ((strcmp (s1, s2) == 0))
+
+/* Like `getgroups', but for user USERNAME instead of for the current
+   process.  Store at most MAXCOUNT group IDs in the GROUPLIST array.
+   If GID is not -1, store it first (if possible).  GID should be the
+   group ID (pw_gid) obtained from getpwuid, in case USERNAME is not
+   listed in /etc/groups.
+   Always return the number of groups of which USERNAME is a member.  */
 
 int
 getugroups (int maxcount, GETGROUPS_T *grouplist, char *username, gid_t gid)
@@ -51,19 +57,26 @@ getugroups (int maxcount, GETGROUPS_T *grouplist, char *username, gid_t gid)
   register char **cp;
   register int count = 0;
 
-  if (maxcount != 0)
-    grouplist[count++] = gid;
+  if (gid != -1)
+    {
+      if (maxcount != 0)
+	grouplist[count] = gid;
+      ++count;
+    }
 
   setgrent ();
   while ((grp = getgrent ()) != 0)
-    for (cp = grp->gr_mem; *cp; ++cp)
-      if (!strcmp (username, *cp))
+    {
+      for (cp = grp->gr_mem; *cp; ++cp)
 	{
 	  int n;
 
+	  if ( ! STREQ (username, *cp))
+	    continue;
+
 	  /* See if this group number is already on the list.  */
 	  for (n = 0; n < count; ++n)
-	    if (grouplist[n] == grp->gr_gid)
+	    if (grouplist && grouplist[n] == grp->gr_gid)
 	      break;
 
 	  /* If it's a new group number, then try to add it to the list.  */
@@ -81,6 +94,8 @@ getugroups (int maxcount, GETGROUPS_T *grouplist, char *username, gid_t gid)
 	      count++;
 	    }
 	}
+    }
   endgrent ();
+
   return count;
 }