summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--sshd.c6
2 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 7af3d15f7..7c535eae8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,10 @@
14 [ssh_config.5 ssh.1] 14 [ssh_config.5 ssh.1]
15 mention ability to specify bind_address for DynamicForward and -D options; 15 mention ability to specify bind_address for DynamicForward and -D options;
16 bz#1077 spotted by Haruyama Seigo 16 bz#1077 spotted by Haruyama Seigo
17 - djm@cvs.openbsd.org 2005/09/19 11:47:09
18 [sshd.c]
19 stop connection abort on rekey with delayed compression enabled when
20 post-auth privsep is disabled (e.g. when root is logged in); ok dtucker@
17 21
1820050930 2220050930
19 - (dtucker) [openbsd-compat/openbsd-compat.h] Bug #1096: Add prototype 23 - (dtucker) [openbsd-compat/openbsd-compat.h] Bug #1096: Add prototype
@@ -3054,4 +3058,4 @@
3054 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3058 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3055 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3059 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3056 3060
3057$Id: ChangeLog,v 1.3905 2005/10/03 08:13:42 dtucker Exp $ 3061$Id: ChangeLog,v 1.3906 2005/10/03 08:16:02 dtucker Exp $
diff --git a/sshd.c b/sshd.c
index ceb85dd54..6ef2eee13 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.313 2005/09/13 23:40:07 djm Exp $"); 45RCSID("$OpenBSD: sshd.c,v 1.314 2005/09/19 11:47:09 djm Exp $");
46 46
47#include <openssl/dh.h> 47#include <openssl/dh.h>
48#include <openssl/bn.h> 48#include <openssl/bn.h>
@@ -633,9 +633,8 @@ privsep_postauth(Authctxt *authctxt)
633 if (authctxt->pw->pw_uid == 0 || options.use_login) { 633 if (authctxt->pw->pw_uid == 0 || options.use_login) {
634#endif 634#endif
635 /* File descriptor passing is broken or root login */ 635 /* File descriptor passing is broken or root login */
636 monitor_apply_keystate(pmonitor);
637 use_privsep = 0; 636 use_privsep = 0;
638 return; 637 goto out;
639 } 638 }
640 639
641 /* Authentication complete */ 640 /* Authentication complete */
@@ -669,6 +668,7 @@ privsep_postauth(Authctxt *authctxt)
669 /* Drop privileges */ 668 /* Drop privileges */
670 do_setusercontext(authctxt->pw); 669 do_setusercontext(authctxt->pw);
671 670
671 out:
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