summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-08-16 01:17:22 +0200
committerBen Lindstrom <mouring@eviladmin.org>2001-08-16 01:17:22 +0200
commit049e0dd6cffbf6b5bffe0e2901957e87caccc869 (patch)
tree754d009ff8385cbc4e69febc306f520620712e29
parent - markus@cvs.openbsd.org 2001/08/08 18:20:15 (diff)
downloadopenssh-049e0dd6cffbf6b5bffe0e2901957e87caccc869.tar.xz
openssh-049e0dd6cffbf6b5bffe0e2901957e87caccc869.zip
- markus@cvs.openbsd.org 2001/08/08 21:34:19
[uidswap.c] undo last change; does not work for sshd
-rw-r--r--ChangeLog5
-rw-r--r--uidswap.c5
2 files changed, 5 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index bd4498dfb..15958fe99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,9 @@
[uidswap.c]
permanently_set_uid is a noop if user is not privilegued;
fixes bug on solaris; from sbi@uchicago.edu
+ - markus@cvs.openbsd.org 2001/08/08 21:34:19
+ [uidswap.c]
+ undo last change; does not work for sshd
20010814
- (stevesk) sshpty.c, cray.[ch]: whitespace, formatting and cleanup
@@ -6302,4 +6305,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
-$Id: ChangeLog,v 1.1478 2001/08/15 23:14:49 mouring Exp $
+$Id: ChangeLog,v 1.1479 2001/08/15 23:17:22 mouring Exp $
diff --git a/uidswap.c b/uidswap.c
index 32305a7dc..cc91fcf25 100644
--- a/uidswap.c
+++ b/uidswap.c
@@ -12,7 +12,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: uidswap.c,v 1.17 2001/08/08 18:20:15 markus Exp $");
+RCSID("$OpenBSD: uidswap.c,v 1.18 2001/08/08 21:34:19 markus Exp $");
#include "log.h"
#include "uidswap.h"
@@ -145,9 +145,6 @@ restore_uid(void)
void
permanently_set_uid(struct passwd *pw)
{
- /* it's a no-op unless privileged */
- if (!privileged)
- return;
if (temporarily_use_uid_effective)
fatal("restore_uid: temporarily_use_uid effective");
if (setgid(pw->pw_gid) < 0)