RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- markus@cvs.openbsd.org 2001/04/08 11:24:33 

[uidswap.c]
     KNF
This commit is contained in:
Ben Lindstrom 2001-04-08 18:38:04 +00:00
parent 3bb4f9da73
commit f52373f732
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -21,6 +21,9 @@
portforwarding). work by Dan Kaminsky <dankamin@cisco.com> and me. portforwarding). work by Dan Kaminsky <dankamin@cisco.com> and me.
thanks to Dan for this great patch: use 'ssh -D 1080 host' and make thanks to Dan for this great patch: use 'ssh -D 1080 host' and make
netscape use localhost:1080 as a socks proxy. netscape use localhost:1080 as a socks proxy.
- markus@cvs.openbsd.org 2001/04/08 11:24:33
[uidswap.c]
KNF
20010408 20010408
- OpenBSD CVS Sync - OpenBSD CVS Sync
@ -4961,4 +4964,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - Released 1.0pre1
$Id: ChangeLog,v 1.1084 2001/04/08 18:30:26 mouring Exp $ $Id: ChangeLog,v 1.1085 2001/04/08 18:38:04 mouring Exp $

16
uidswap.c
View File

@ -12,7 +12,7 @@
*/ */
#include "includes.h" #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 "log.h"
#include "uidswap.h" #include "uidswap.h"
@ -54,8 +54,8 @@ temporarily_use_uid(struct passwd *pw)
} }
privileged = 1; privileged = 1;
temporarily_use_uid_effective = 1; temporarily_use_uid_effective = 1;
saved_egid = getegid(); saved_egid = getegid();
saved_egroupslen = getgroups(NGROUPS_MAX, saved_egroups); saved_egroupslen = getgroups(NGROUPS_MAX, saved_egroups);
if (saved_egroupslen < 0) if (saved_egroupslen < 0)
fatal("getgroups: %.100s", strerror(errno)); fatal("getgroups: %.100s", strerror(errno));
@ -69,10 +69,10 @@ temporarily_use_uid(struct passwd *pw)
fatal("getgroups: %.100s", strerror(errno)); fatal("getgroups: %.100s", strerror(errno));
} }
/* Set the effective uid to the given (unprivileged) uid. */ /* 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)); fatal("setgroups: %.100s", strerror(errno));
pw->pw_gid = pw->pw_gid; pw->pw_gid = pw->pw_gid;
if (setegid(pw->pw_gid) < 0) if (setegid(pw->pw_gid) < 0)
fatal("setegid %u: %.100s", (u_int) pw->pw_gid, fatal("setegid %u: %.100s", (u_int) pw->pw_gid,
strerror(errno)); strerror(errno));
if (seteuid(pw->pw_uid) == -1) if (seteuid(pw->pw_uid) == -1)
@ -95,9 +95,9 @@ restore_uid(void)
/* Set the effective uid back to the saved uid. */ /* Set the effective uid back to the saved uid. */
if (seteuid(saved_euid) < 0) if (seteuid(saved_euid) < 0)
fatal("seteuid %u: %.100s", (u_int) saved_euid, strerror(errno)); 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)); 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)); fatal("setegid %u: %.100s", (u_int) saved_egid, strerror(errno));
temporarily_use_uid_effective = 0; temporarily_use_uid_effective = 0;
} }