X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fgetugroups.c;h=6fad8b7b530989aafafe4b695895c60879889375;hb=310f220f3dc11206e8c8374c2350d8e5f74c8427;hp=7b99d649b3d6a1710d0cf5fc788131393c851623;hpb=bf3840957f16ad999515c5c5287f6ef13e211379;p=gnulib.git

diff --git a/lib/getugroups.c b/lib/getugroups.c
index 7b99d649b..6fad8b7b5 100644
--- a/lib/getugroups.c
+++ b/lib/getugroups.c
@@ -1,5 +1,5 @@
 /* getugroups.c -- return a list of the groups a user is in
-   Copyright (C) 1990, 1991, 1998 Free Software Foundation.
+   Copyright (C) 1990, 1991, 1998, 1999 Free Software Foundation.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -41,19 +41,27 @@ struct group *getgrent ();
 # include <strings.h>
 #endif
 
-/* Like `getgroups', but for user USERNAME instead of for
-   the current process. */
+/* 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 (maxcount, grouplist, username)
-     int maxcount;
-     GETGROUPS_T *grouplist;
-     char *username;
+getugroups (int maxcount, GETGROUPS_T *grouplist, char *username, gid_t gid)
 {
   struct group *grp;
   register char **cp;
   register int count = 0;
 
+  if (gid != -1)
+    {
+      if (maxcount != 0)
+	grouplist[count] = gid;
+      ++count;
+    }
+
   setgrent ();
   while ((grp = getgrent ()) != 0)
     for (cp = grp->gr_mem; *cp; ++cp)