mirror of git://anongit.mindrot.org/openssh.git
- djm@cvs.openbsd.org 2005/09/21 23:37:11
[sshd.c] change label at markus@'s request
This commit is contained in:
parent
e2dd2d5baa
commit
45b0142643
|
@ -33,6 +33,9 @@
|
|||
- djm@cvs.openbsd.org 2005/09/21 23:36:54
|
||||
[sshd_config.5]
|
||||
aquire -> acquire, from stevesk@
|
||||
- djm@cvs.openbsd.org 2005/09/21 23:37:11
|
||||
[sshd.c]
|
||||
change label at markus@'s request
|
||||
|
||||
20050930
|
||||
- (dtucker) [openbsd-compat/openbsd-compat.h] Bug #1096: Add prototype
|
||||
|
@ -3073,4 +3076,4 @@
|
|||
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
|
||||
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
|
||||
|
||||
$Id: ChangeLog,v 1.3911 2005/10/03 08:19:06 dtucker Exp $
|
||||
$Id: ChangeLog,v 1.3912 2005/10/03 08:20:00 dtucker Exp $
|
||||
|
|
6
sshd.c
6
sshd.c
|
@ -42,7 +42,7 @@
|
|||
*/
|
||||
|
||||
#include "includes.h"
|
||||
RCSID("$OpenBSD: sshd.c,v 1.314 2005/09/19 11:47:09 djm Exp $");
|
||||
RCSID("$OpenBSD: sshd.c,v 1.315 2005/09/21 23:37:11 djm Exp $");
|
||||
|
||||
#include <openssl/dh.h>
|
||||
#include <openssl/bn.h>
|
||||
|
@ -634,7 +634,7 @@ privsep_postauth(Authctxt *authctxt)
|
|||
#endif
|
||||
/* File descriptor passing is broken or root login */
|
||||
use_privsep = 0;
|
||||
goto out;
|
||||
goto skip;
|
||||
}
|
||||
|
||||
/* Authentication complete */
|
||||
|
@ -668,7 +668,7 @@ privsep_postauth(Authctxt *authctxt)
|
|||
/* Drop privileges */
|
||||
do_setusercontext(authctxt->pw);
|
||||
|
||||
out:
|
||||
skip:
|
||||
/* It is safe now to apply the key state */
|
||||
monitor_apply_keystate(pmonitor);
|
||||
|
||||
|
|
Loading…
Reference in New Issue