- djm@cvs.openbsd.org 2003/06/04 10:23:48
[sshd.c]
remove duplicated group-dropping code; ok markus@
diff --git a/ChangeLog b/ChangeLog
index 70e2bb7..b46c2fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,9 @@
disable challenge/response and keyboard-interactive auth methods
upon hostkey mismatch. based on patch from fcusack AT fcusack.com.
bz #580; ok markus@
+ - djm@cvs.openbsd.org 2003/06/04 10:23:48
+ [sshd.c]
+ remove duplicated group-dropping code; ok markus@
20030603
- (djm) Replace setproctitle replacement with code derived from
@@ -439,4 +442,4 @@
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au
-$Id: ChangeLog,v 1.2774 2003/06/04 10:31:53 djm Exp $
+$Id: ChangeLog,v 1.2775 2003/06/04 10:32:12 djm Exp $
diff --git a/sshd.c b/sshd.c
index e73135c..bdb0920 100644
--- a/sshd.c
+++ b/sshd.c
@@ -42,7 +42,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: sshd.c,v 1.267 2003/05/29 16:58:45 deraadt Exp $");
+RCSID("$OpenBSD: sshd.c,v 1.268 2003/06/04 10:23:48 djm Exp $");
#include <openssl/dh.h>
#include <openssl/bn.h>
@@ -564,10 +564,6 @@
do_setusercontext(pw);
#else
gidset[0] = pw->pw_gid;
- if (setegid(pw->pw_gid) < 0)
- fatal("setegid failed for %u", (u_int)pw->pw_gid);
- if (setgid(pw->pw_gid) < 0)
- fatal("setgid failed for %u", (u_int)pw->pw_gid);
if (setgroups(1, gidset) < 0)
fatal("setgroups: %.100s", strerror(errno));
permanently_set_uid(pw);