diff options
| author | Ted Unangst <tedu@cvs.openbsd.org> | 2015-07-30 17:04:34 +0000 |
|---|---|---|
| committer | Ted Unangst <tedu@cvs.openbsd.org> | 2015-07-30 17:04:34 +0000 |
| commit | 3737f6cbe11383f15a13844bd21b38685436e317 (patch) | |
| tree | b6891d0e37f4a631424dbe6b205cbdbbfc245e79 /usr.bin | |
| parent | bacabc9d2b3e9b5e9ab8a90b9b2686d88a0d6fa8 (diff) | |
make gid parsing look like uid parsing. from Martijn van Duren
ack deraadt
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/doas/doas.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/usr.bin/doas/doas.c b/usr.bin/doas/doas.c index 8f7de3bedeb..d0e006e69b4 100644 --- a/usr.bin/doas/doas.c +++ b/usr.bin/doas/doas.c @@ -1,4 +1,4 @@ -/* $OpenBSD: doas.c,v 1.32 2015/07/29 00:00:31 tedu Exp $ */ +/* $OpenBSD: doas.c,v 1.33 2015/07/30 17:04:33 tedu Exp $ */ /* * Copyright (c) 2015 Ted Unangst <tedu@openbsd.org> * @@ -80,19 +80,20 @@ uidcheck(const char *s, uid_t desired) return 0; } -static gid_t -strtogid(const char *s) +static int +parsegid(const char *s, gid_t *gid) { struct group *gr; const char *errstr; - gid_t gid; - if ((gr = getgrnam(s)) != NULL) - return gr->gr_gid; - gid = strtonum(s, 0, GID_MAX, &errstr); + if ((gr = getgrnam(s)) != NULL) { + *gid = gr->gr_gid; + return 0; + } + *gid = strtonum(s, 0, GID_MAX, &errstr); if (errstr) return -1; - return gid; + return 0; } static int @@ -102,8 +103,8 @@ match(uid_t uid, gid_t *groups, int ngroups, uid_t target, const char *cmd, int i; if (r->ident[0] == ':') { - gid_t rgid = strtogid(r->ident + 1); - if (rgid == -1) + gid_t rgid; + if (parsegid(r->ident + 1, &rgid) == -1) return 0; for (i = 0; i < ngroups; i++) { if (rgid == groups[i]) |