Fix setting of groups list

This commit is contained in:
Todd C. Miller
2010-03-22 08:26:05 -04:00
parent 8db39a8586
commit 7af5cdfaf4

View File

@@ -283,7 +283,7 @@ get_user_groups(struct user_details *ud)
#ifdef HAVE_GETGROUPS #ifdef HAVE_GETGROUPS
size_t glsize; size_t glsize;
char *cp; char *cp;
int i; int i, len;
if ((ud->ngroups = getgroups(0, NULL)) <= 0) if ((ud->ngroups = getgroups(0, NULL)) <= 0)
return NULL; return NULL;
@@ -296,8 +296,10 @@ get_user_groups(struct user_details *ud)
memcpy(gid_list, "groups=", sizeof("groups=") - 1); memcpy(gid_list, "groups=", sizeof("groups=") - 1);
cp = gid_list + sizeof("groups=") - 1; cp = gid_list + sizeof("groups=") - 1;
for (i = 0; i < ud->ngroups; i++) { for (i = 0; i < ud->ngroups; i++) {
snprintf(cp, glsize - (cp - gid_list), "%lu%s", /* XXX - check rval */
(unsigned long)ud->groups[i], i ? "," : ""); len = snprintf(cp, glsize - (cp - gid_list), "%s%lu",
i ? "," : "", (unsigned long)ud->groups[i]);
cp += len;
} }
#endif #endif
return gid_list; return gid_list;