- djm@cvs.openbsd.org 2011/09/25 05:44:47

     [auth2-pubkey.c]
     improve the AuthorizedPrincipalsFile debug log message to include
     file and line number

1 files changed, 2 insertions, 2 deletions

diff --git a/sshd.c b/sshd.c
index 28a8a489b..21cdfa507 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshd.c,v 1.386 2011/09/09 22:38:21 djm Exp $ */
+/* $OpenBSD: sshd.c,v 1.387 2011/09/30 00:47:37 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -2366,7 +2366,7 @@ cleanup_exit(int i)
 {
         if (the_authctxt) {
                 do_cleanup(the_authctxt);
-                if (privsep_is_preauth && pmonitor->m_pid > 1) {
+                if (use_privsep && privsep_is_preauth && pmonitor->m_pid > 1) {
                         debug("Killing privsep child %d", pmonitor->m_pid);
                         if (kill(pmonitor->m_pid, SIGKILL) != 0 &&
                             errno == ESRCH)