diff options
| -rw-r--r-- | package/CHANGES | 1 | ||||
| -rw-r--r-- | src/chpst.c | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/package/CHANGES b/package/CHANGES index e2d2320..3b4ac5c 100644 --- a/package/CHANGES +++ b/package/CHANGES @@ -10,6 +10,7 @@ rewording. * doc/useinit.html: add instructions on how to use with upstart (thx Lloyd Zusman). + * chpst.c: add explicit braces to avoid ambiguous 'else'. 1.7.2 Tue, 21 Nov 2006 15:13:47 +0000 diff --git a/src/chpst.c b/src/chpst.c index 8f84928..1bfc8e0 100644 --- a/src/chpst.c +++ b/src/chpst.c @@ -64,12 +64,13 @@ unsigned int lockdelay; void suidgid(char *user, unsigned int ext) { struct uidgid ugid; - if (ext) + if (ext) { if (! uidgids_get(&ugid, user)) { if (*user == ':') fatalx("invalid uid/gids", user +1); if (errno) fatal("unable to get password/group file entry"); fatalx("unknown user/group", user); } + } else if (! uidgid_get(&ugid, user)) { if (errno) fatal("unable to get password file entry"); @@ -84,12 +85,13 @@ void euidgid(char *user, unsigned int ext) { struct uidgid ugid; char bufnum[FMT_ULONG]; - if (ext) + if (ext) { if (! uidgids_get(&ugid, user)) { if (*user == ':') fatalx("invalid uid/gids", user +1); if (errno) fatal("unable to get password/group file entry"); fatalx("unknown user/group", user); } + } else if (! uidgid_get(&ugid, user)) { if (errno) fatal("unable to get password file entry"); |