Module Name: src Committed By: tls Date: Sun Aug 10 06:58:34 UTC 2014
Modified Files: src/usr.bin/newgrp [tls-earlyentropy]: grutil.c Log Message: Rebase. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.3.6.1 src/usr.bin/newgrp/grutil.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/usr.bin/newgrp/grutil.c diff -u src/usr.bin/newgrp/grutil.c:1.3 src/usr.bin/newgrp/grutil.c:1.3.6.1 --- src/usr.bin/newgrp/grutil.c:1.3 Thu Jan 24 17:46:30 2013 +++ src/usr.bin/newgrp/grutil.c Sun Aug 10 06:58:34 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: grutil.c,v 1.3 2013/01/24 17:46:30 christos Exp $ */ +/* $NetBSD: grutil.c,v 1.3.6.1 2014/08/10 06:58:34 tls Exp $ */ /*- * Copyright (c) 2007 The NetBSD Foundation, Inc. @@ -29,7 +29,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include <sys/cdefs.h> -__RCSID("$NetBSD: grutil.c,v 1.3 2013/01/24 17:46:30 christos Exp $"); +__RCSID("$NetBSD: grutil.c,v 1.3.6.1 2014/08/10 06:58:34 tls Exp $"); #include <sys/param.h> #include <err.h> @@ -147,7 +147,7 @@ addgrp(gid_t newgid, int makespace) return ADDGRP_NOERROR; rval = alloc_groups(&ngroups, &groups, &ngroupsmax); - if (rval != 0) + if (rval != ADDGRP_NOERROR) return rval; /* @@ -235,7 +235,7 @@ newgrp(const char *gname, struct passwd if (ruid == 0 || pwd->pw_gid == grp->gr_gid) return grp->gr_gid; - if (alloc_groups(&ngroups, &groups, &ngroupsmax) == 0) { + if (alloc_groups(&ngroups, &groups, &ngroupsmax) == ADDGRP_NOERROR) { int i; for (i = 0; i < ngroups; i++) if (groups[i] == grp->gr_gid) {