summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--sshd.c6
2 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index fdf7c72a6..2028be72e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -33,6 +33,9 @@
33 - djm@cvs.openbsd.org 2005/09/21 23:36:54 33 - djm@cvs.openbsd.org 2005/09/21 23:36:54
34 [sshd_config.5] 34 [sshd_config.5]
35 aquire -> acquire, from stevesk@ 35 aquire -> acquire, from stevesk@
36 - djm@cvs.openbsd.org 2005/09/21 23:37:11
37 [sshd.c]
38 change label at markus@'s request
36 39
3720050930 4020050930
38 - (dtucker) [openbsd-compat/openbsd-compat.h] Bug #1096: Add prototype 41 - (dtucker) [openbsd-compat/openbsd-compat.h] Bug #1096: Add prototype
@@ -3073,4 +3076,4 @@
3073 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3076 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3074 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3077 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3075 3078
3076$Id: ChangeLog,v 1.3911 2005/10/03 08:19:06 dtucker Exp $ 3079$Id: ChangeLog,v 1.3912 2005/10/03 08:20:00 dtucker Exp $
diff --git a/sshd.c b/sshd.c
index 6ef2eee13..c4d66e2fc 100644
--- a/sshd.c
+++ b/sshd.c
@@ -42,7 +42,7 @@
42 */ 42 */
43 43
44#include "includes.h" 44#include "includes.h"
45RCSID("$OpenBSD: sshd.c,v 1.314 2005/09/19 11:47:09 djm Exp $"); 45RCSID("$OpenBSD: sshd.c,v 1.315 2005/09/21 23:37:11 djm Exp $");
46 46
47#include <openssl/dh.h> 47#include <openssl/dh.h>
48#include <openssl/bn.h> 48#include <openssl/bn.h>
@@ -634,7 +634,7 @@ privsep_postauth(Authctxt *authctxt)
634#endif 634#endif
635 /* File descriptor passing is broken or root login */ 635 /* File descriptor passing is broken or root login */
636 use_privsep = 0; 636 use_privsep = 0;
637 goto out; 637 goto skip;
638 } 638 }
639 639
640 /* Authentication complete */ 640 /* Authentication complete */
@@ -668,7 +668,7 @@ privsep_postauth(Authctxt *authctxt)
668 /* Drop privileges */ 668 /* Drop privileges */
669 do_setusercontext(authctxt->pw); 669 do_setusercontext(authctxt->pw);
670 670
671 out: 671 skip:
672 /* It is safe now to apply the key state */ 672 /* It is safe now to apply the key state */
673 monitor_apply_keystate(pmonitor); 673 monitor_apply_keystate(pmonitor);
674 674