- djm@cvs.openbsd.org 2005/09/21 23:37:11

     [sshd.c]
     change label at markus@'s request

diff --git a/ChangeLog b/ChangeLog
index ae13ab908ff163ea83caaab119d7919f67739561..bad0043d13ee077e45b3e56b5b375e89ba28e50c 100644 (file)
--- 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

diff --git a/sshd.c b/sshd.c
index 6ef2eee1349ee6900d8003fca747adac09840994..c4d66e2fca520103c9fcb9b391d3def9eb1f7037 100644 (file)
--- 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);