tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- markus@cvs.openbsd.org 2001/04/20 16:32:22 

[uidswap.c]
     set non-privileged gid before uid; tholo@ and deraadt@
This commit is contained in:
Ben Lindstrom 2001-04-22 17:08:00 +00:00
parent b8fbb8eca0
commit ee2786a2a1
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,9 @@
20010422
- OpenBSD CVS Sync
- markus@cvs.openbsd.org 2001/04/20 16:32:22
[uidswap.c]
set non-privileged gid before uid; tholo@ and deraadt@
20010421
- OpenBSD CVS Sync
- djm@cvs.openbsd.org 2001/04/20 07:17:51
@ -5200,4 +5206,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
$Id: ChangeLog,v 1.1152 2001/04/21 21:31:52 tim Exp $
$Id: ChangeLog,v 1.1153 2001/04/22 17:08:00 mouring Exp $

10
uidswap.c
View File

@ -12,7 +12,7 @@
*/
#include "includes.h"
RCSID("$OpenBSD: uidswap.c,v 1.15 2001/04/08 11:24:33 markus Exp $");
RCSID("$OpenBSD: uidswap.c,v 1.16 2001/04/20 16:32:22 markus Exp $");
#include "log.h"
#include "uidswap.h"
@ -81,7 +81,7 @@ temporarily_use_uid(struct passwd *pw)
}
/*
* Restores to the original uid.
* Restores to the original (privileged) uid.
*/
void
restore_uid(void)
@ -92,7 +92,7 @@ restore_uid(void)
return;
if (!temporarily_use_uid_effective)
fatal("restore_uid: temporarily_use_uid not effective");
/* Set the effective uid back to the saved uid. */
/* Set the effective uid back to the saved privileged uid. */
if (seteuid(saved_euid) < 0)
fatal("seteuid %u: %.100s", (u_int) saved_euid, strerror(errno));
if (setgroups(saved_egroupslen, saved_egroups) < 0)
@ -111,8 +111,8 @@ permanently_set_uid(struct passwd *pw)
{
if (temporarily_use_uid_effective)
fatal("restore_uid: temporarily_use_uid effective");
if (setuid(pw->pw_uid) < 0)
fatal("setuid %u: %.100s", (u_int) pw->pw_uid, strerror(errno));
if (setgid(pw->pw_gid) < 0)
fatal("setgid %u: %.100s", (u_int) pw->pw_gid, strerror(errno));
if (setuid(pw->pw_uid) < 0)
fatal("setuid %u: %.100s", (u_int) pw->pw_uid, strerror(errno));
}