diff options
Diffstat (limited to 'sshd.c')
-rw-r--r-- | sshd.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -42,7 +42,7 @@ | |||
42 | */ | 42 | */ |
43 | 43 | ||
44 | #include "includes.h" | 44 | #include "includes.h" |
45 | RCSID("$OpenBSD: sshd.c,v 1.313 2005/09/13 23:40:07 djm Exp $"); | 45 | RCSID("$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 | ||