diff options
author | Damien Miller <djm@mindrot.org> | 2003-06-04 20:32:12 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2003-06-04 20:32:12 +1000 |
commit | 31b3a0a98f520dede4e218898eed3cf9d415c903 (patch) | |
tree | 30834ac0ab6596eab9bc600e703c6d8328708f19 | |
parent | 941ac459ce52af15caddcfafce3cf611138600ce (diff) |
- djm@cvs.openbsd.org 2003/06/04 10:23:48
[sshd.c]
remove duplicated group-dropping code; ok markus@
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | sshd.c | 6 |
2 files changed, 5 insertions, 6 deletions
@@ -11,6 +11,9 @@ | |||
11 | disable challenge/response and keyboard-interactive auth methods | 11 | disable challenge/response and keyboard-interactive auth methods |
12 | upon hostkey mismatch. based on patch from fcusack AT fcusack.com. | 12 | upon hostkey mismatch. based on patch from fcusack AT fcusack.com. |
13 | bz #580; ok markus@ | 13 | bz #580; ok markus@ |
14 | - djm@cvs.openbsd.org 2003/06/04 10:23:48 | ||
15 | [sshd.c] | ||
16 | remove duplicated group-dropping code; ok markus@ | ||
14 | 17 | ||
15 | 20030603 | 18 | 20030603 |
16 | - (djm) Replace setproctitle replacement with code derived from | 19 | - (djm) Replace setproctitle replacement with code derived from |
@@ -439,4 +442,4 @@ | |||
439 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 442 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
440 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 443 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
441 | 444 | ||
442 | $Id: ChangeLog,v 1.2774 2003/06/04 10:31:53 djm Exp $ | 445 | $Id: ChangeLog,v 1.2775 2003/06/04 10:32:12 djm Exp $ |
@@ -42,7 +42,7 @@ | |||
42 | */ | 42 | */ |
43 | 43 | ||
44 | #include "includes.h" | 44 | #include "includes.h" |
45 | RCSID("$OpenBSD: sshd.c,v 1.267 2003/05/29 16:58:45 deraadt Exp $"); | 45 | RCSID("$OpenBSD: sshd.c,v 1.268 2003/06/04 10:23:48 djm Exp $"); |
46 | 46 | ||
47 | #include <openssl/dh.h> | 47 | #include <openssl/dh.h> |
48 | #include <openssl/bn.h> | 48 | #include <openssl/bn.h> |
@@ -564,10 +564,6 @@ privsep_preauth_child(void) | |||
564 | do_setusercontext(pw); | 564 | do_setusercontext(pw); |
565 | #else | 565 | #else |
566 | gidset[0] = pw->pw_gid; | 566 | gidset[0] = pw->pw_gid; |
567 | if (setegid(pw->pw_gid) < 0) | ||
568 | fatal("setegid failed for %u", (u_int)pw->pw_gid); | ||
569 | if (setgid(pw->pw_gid) < 0) | ||
570 | fatal("setgid failed for %u", (u_int)pw->pw_gid); | ||
571 | if (setgroups(1, gidset) < 0) | 567 | if (setgroups(1, gidset) < 0) |
572 | fatal("setgroups: %.100s", strerror(errno)); | 568 | fatal("setgroups: %.100s", strerror(errno)); |
573 | permanently_set_uid(pw); | 569 | permanently_set_uid(pw); |