diff options
| author | Darren Tucker <dtucker@cvs.openbsd.org> | 2011-09-30 00:47:38 +0000 |
|---|---|---|
| committer | Darren Tucker <dtucker@cvs.openbsd.org> | 2011-09-30 00:47:38 +0000 |
| commit | 6ecc2c4df9095162b18c6b112e6ba880b18d327e (patch) | |
| tree | ef5c312b0a45046c403fdb2f5284e0c00d935f3d | |
| parent | 77f0441c244158a4fb6768704a39cb439695f947 (diff) | |
don't attempt privsep cleanup when not using privsep; ok markus@
| -rw-r--r-- | usr.bin/ssh/sshd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/sshd.c b/usr.bin/ssh/sshd.c index 48db8bbd120..5373ae7ca80 100644 --- a/usr.bin/ssh/sshd.c +++ b/usr.bin/ssh/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 @@ -2223,7 +2223,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) |