diff options
| author | dtucker <dtucker> | 2011-10-02 07:59:59 +0000 |
|---|---|---|
| committer | dtucker <dtucker> | 2011-10-02 07:59:59 +0000 |
| commit | b322773ed92a98144a552d8b1954d8daf6b22950 (patch) | |
| tree | 63e74ccaac73e187d249e9e7703e7b7e153ab413 /sshd.c | |
| parent | 2a1b94c0106d2948642096e7b753a932a72d1adc (diff) | |
| download | openssh-b322773ed92a98144a552d8b1954d8daf6b22950.tar.gz | |
- 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
Diffstat (limited to 'sshd.c')
| -rw-r--r-- | sshd.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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) |