# if !defined(GETGROUPS_T)
# define GETGROUPS_T gid_t
# endif
-# ifndef NGROUPS_MAX
-/* It ought to be defined, but just in case. */
-# define NGROUPS_MAX 32
-# endif
#endif
extern int verbose;
static int map_uid(int id, char *name)
{
uid_t uid;
- if (uid != 0 && name_to_uid(name, &uid))
+ if (id != 0 && name_to_uid(name, &uid))
return uid;
return id;
}
static int map_gid(int id, char *name)
{
gid_t gid;
- if (gid != 0 && name_to_gid(name, &gid))
+ if (id != 0 && name_to_gid(name, &gid))
return gid;
return id;
}
return last_out;
if (ngroups < -1) {
gid_t mygid = MY_GID();
- if ((ngroups = getgroups(0, 0)) < 0)
+ if ((ngroups = getgroups(0, NULL)) < 0)
ngroups = 0;
gidset = new_array(GETGROUPS_T, ngroups+1);
+ if (!gidset)
+ out_of_memory("is_in_group");
if (ngroups > 0)
ngroups = getgroups(ngroups, gidset);
/* The default gid might not be in the list on some systems. */
if (n == ngroups)
gidset[ngroups++] = mygid;
if (verbose > 3) {
- char gidbuf[NGROUPS_MAX*16+32];
int pos;
+ char *gidbuf = new_array(char, ngroups*21+32);
+ if (!gidbuf)
+ out_of_memory("is_in_group");
sprintf(gidbuf, "process has %d gid%s: ",
ngroups, ngroups == 1? "" : "s");
pos = strlen(gidbuf);
pos += strlen(gidbuf+pos);
}
rprintf(FINFO, "%s\n", gidbuf);
+ free(gidbuf);
}
}
int id2 = name ? map_uid(id, name) : id;
struct idlist *node;
- node = add_to_list(&uidlist, id, name, map_uid(id, name));
+ node = add_to_list(&uidlist, id, name, id2);
if (verbose > 3) {
rprintf(FINFO, "uid %d(%s) maps to %d\n",
static gid_t last_in = GID_NONE, last_out = GID_NONE;
struct idlist *list;
- if (gid == 0)
- return 0;
+ if (gid == GID_NONE)
+ return GID_NONE;
if (gid == last_in)
return last_out;