diff options
| author | Markus Friedl <markus@cvs.openbsd.org> | 2001-04-08 11:24:34 +0000 |
|---|---|---|
| committer | Markus Friedl <markus@cvs.openbsd.org> | 2001-04-08 11:24:34 +0000 |
| commit | 44877fd2417566a3a80d24c9bfedf09ba3c2952c (patch) | |
| tree | 4c6e8c0c54aaf65526505660173ab28876fda7a5 /usr.bin | |
| parent | 5dca8eda4aa1289a6118acde2a3d2afcfbab5248 (diff) | |
KNF
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/ssh/uidswap.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/usr.bin/ssh/uidswap.c b/usr.bin/ssh/uidswap.c index 8a1ce775c2e..8380071ce42 100644 --- a/usr.bin/ssh/uidswap.c +++ b/usr.bin/ssh/uidswap.c @@ -12,7 +12,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: uidswap.c,v 1.14 2001/04/06 21:00:16 markus Exp $"); +RCSID("$OpenBSD: uidswap.c,v 1.15 2001/04/08 11:24:33 markus Exp $"); #include "log.h" #include "uidswap.h" @@ -54,8 +54,8 @@ temporarily_use_uid(struct passwd *pw) } privileged = 1; temporarily_use_uid_effective = 1; - saved_egid = getegid(); - saved_egroupslen = getgroups(NGROUPS_MAX, saved_egroups); + saved_egid = getegid(); + saved_egroupslen = getgroups(NGROUPS_MAX, saved_egroups); if (saved_egroupslen < 0) fatal("getgroups: %.100s", strerror(errno)); @@ -69,10 +69,10 @@ temporarily_use_uid(struct passwd *pw) fatal("getgroups: %.100s", strerror(errno)); } /* Set the effective uid to the given (unprivileged) uid. */ - if (setgroups(user_groupslen, user_groups) < 0) + if (setgroups(user_groupslen, user_groups) < 0) fatal("setgroups: %.100s", strerror(errno)); - pw->pw_gid = pw->pw_gid; - if (setegid(pw->pw_gid) < 0) + pw->pw_gid = pw->pw_gid; + if (setegid(pw->pw_gid) < 0) fatal("setegid %u: %.100s", (u_int) pw->pw_gid, strerror(errno)); if (seteuid(pw->pw_uid) == -1) @@ -95,9 +95,9 @@ restore_uid(void) /* Set the effective uid back to the saved uid. */ if (seteuid(saved_euid) < 0) fatal("seteuid %u: %.100s", (u_int) saved_euid, strerror(errno)); - if (setgroups(saved_egroupslen, saved_egroups) < 0) + if (setgroups(saved_egroupslen, saved_egroups) < 0) fatal("setgroups: %.100s", strerror(errno)); - if (setegid(saved_egid) < 0) + if (setegid(saved_egid) < 0) fatal("setegid %u: %.100s", (u_int) saved_egid, strerror(errno)); temporarily_use_uid_effective = 0; } |