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 @@
    - 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 $
diff --git a/sshd.c b/sshd.c
index 6ef2eee13..c4d66e2fc 100644
--- a/sshd.c
+++ b/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);