diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libc/rpc/netname.c | 3 | ||||
| -rw-r--r-- | lib/libc/rpc/netnamer.c | 10 | ||||
| -rw-r--r-- | lib/libkvm/kvm_proc.c | 3 |
3 files changed, 4 insertions, 12 deletions
diff --git a/lib/libc/rpc/netname.c b/lib/libc/rpc/netname.c index 2f30530..72361ba 100644 --- a/lib/libc/rpc/netname.c +++ b/lib/libc/rpc/netname.c @@ -61,9 +61,6 @@ __FBSDID("$FreeBSD$"); #ifndef MAXHOSTNAMELEN #define MAXHOSTNAMELEN 256 #endif -#ifndef NGROUPS -#define NGROUPS 16 -#endif #define TYPE_BIT(type) (sizeof (type) * CHAR_BIT) diff --git a/lib/libc/rpc/netnamer.c b/lib/libc/rpc/netnamer.c index 7e567df..772160a 100644 --- a/lib/libc/rpc/netnamer.c +++ b/lib/libc/rpc/netnamer.c @@ -66,10 +66,6 @@ static char *NETIDFILE = "/etc/netid"; static int getnetid( char *, char * ); static int _getgroups( char *, gid_t * ); -#ifndef NGROUPS -#define NGROUPS 16 -#endif - /* * Convert network-name into unix credential */ @@ -104,7 +100,7 @@ netname2user(netname, uidp, gidp, gidlenp, gidlist) return (0); } *gidp = (gid_t) atol(p); - for (gidlen = 0; gidlen < NGROUPS; gidlen++) { + for (gidlen = 0; gidlen < NGRPS; gidlen++) { p = strsep(&res, "\n,"); if (p == NULL) break; @@ -157,7 +153,7 @@ netname2user(netname, uidp, gidp, gidlenp, gidlist) static int _getgroups(uname, groups) char *uname; - gid_t groups[NGROUPS]; + gid_t groups[NGRPS]; { gid_t ngroups = 0; struct group *grp; @@ -169,7 +165,7 @@ _getgroups(uname, groups) while ((grp = getgrent())) { for (i = 0; grp->gr_mem[i]; i++) if (!strcmp(grp->gr_mem[i], uname)) { - if (ngroups == NGROUPS) { + if (ngroups == NGRPS) { #ifdef DEBUG fprintf(stderr, "initgroups: %s is in too many groups\n", uname); diff --git a/lib/libkvm/kvm_proc.c b/lib/libkvm/kvm_proc.c index 7402b93..d765b6e 100644 --- a/lib/libkvm/kvm_proc.c +++ b/lib/libkvm/kvm_proc.c @@ -146,8 +146,7 @@ kvm_proclist(kd, what, arg, p, bp, maxcnt) kp->ki_rgid = ucred.cr_rgid; kp->ki_svgid = ucred.cr_svgid; kp->ki_ngroups = ucred.cr_ngroups; - bcopy(ucred.cr_groups, kp->ki_groups, - NGROUPS * sizeof(gid_t)); + kp->ki_groups = ucred.cr_groups; kp->ki_uid = ucred.cr_uid; if (ucred.cr_prison != NULL) { if (KREAD(kd, (u_long)ucred.cr_prison, &pr)) { |
