diff options
-rw-r--r-- | lib/getugroups.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/lib/getugroups.c b/lib/getugroups.c index d76517cfc..6fad8b7b5 100644 --- a/lib/getugroups.c +++ b/lib/getugroups.c @@ -41,8 +41,12 @@ 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 (int maxcount, GETGROUPS_T *grouplist, char *username, gid_t gid) @@ -51,8 +55,12 @@ 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) |