diff options
| author |   schwarze <schwarze@openbsd.org> | 2009-06-03 16:02:44 +0000 |
|---|---|---|
| committer | schwarze <schwarze@openbsd.org> | 2009-06-03 16:02:44 +0000 |
| commit | 7584db8dabada0050c7f1861c7a252f7c600845a (patch) | |
| tree | 9df1649015fc595ac572b7353e3eaac5425e3041 /lib/libc/gen/getgrouplist.c | |
| parent | Add missing documentation for the -a flag used to move to next/previous window (diff) | |
| download | wireguard-openbsd-7584db8dabada0050c7f1861c7a252f7c600845a.tar.xz wireguard-openbsd-7584db8dabada0050c7f1861c7a252f7c600845a.zip | |
Take advantage of the surprise libc bump to bring in
YP group(5) exclusion, i.e. support -groupname:*:: in /etc/group.
Such groups will be excluded from later +:*::,
in just the same was as it is already done for passwd(5).
I have been running this since the autumn of 2008.
Discussed with several (including deraadt@, millert@, jmc@).
Diffstat (limited to 'lib/libc/gen/getgrouplist.c')
| -rw-r--r-- | lib/libc/gen/getgrouplist.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/lib/libc/gen/getgrouplist.c b/lib/libc/gen/getgrouplist.c index 846f0bc56cc..9b3d5fff649 100644 --- a/lib/libc/gen/getgrouplist.c +++ b/lib/libc/gen/getgrouplist.c @@ -1,4 +1,4 @@ -/* $OpenBSD: getgrouplist.c,v 1.16 2009/03/27 12:31:31 schwarze Exp $ */ +/* $OpenBSD: getgrouplist.c,v 1.17 2009/06/03 16:02:44 schwarze Exp $ */ /* * Copyright (c) 2008 Ingo Schwarze <schwarze@usta.de> * Copyright (c) 1991, 1993 @@ -145,6 +145,7 @@ getgrouplist(const char *uname, gid_t agroup, gid_t *groups, int *grpcnt) { int i, ngroups = 0, ret = 0, maxgroups = *grpcnt, bail; int needyp = 0, foundyp = 0; + int *skipyp = &foundyp; extern struct group *_getgrent_yp(int *); struct group *grp; @@ -161,9 +162,12 @@ getgrouplist(const char *uname, gid_t agroup, gid_t *groups, int *grpcnt) * Scan the group file to find additional groups. */ setgrent(); - while ((grp = _getgrent_yp(&foundyp)) || foundyp) { + while ((grp = _getgrent_yp(skipyp)) || foundyp) { if (foundyp) { - needyp = 1; + if (foundyp > 0) + needyp = 1; + else + skipyp = NULL; foundyp = 0; continue; } @@ -190,7 +194,7 @@ getgrouplist(const char *uname, gid_t agroup, gid_t *groups, int *grpcnt) /* * If we were told that there is a YP marker, look at netid data. */ - if (needyp) { + if (skipyp && needyp) { char buf[MAXLINELENGTH], *ypdata = NULL, *key; static char *__ypdomain; struct passwd pwstore; |