summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--sshd.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 37cd895bc..263951305 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,9 @@
22 - dtucker@cvs.openbsd.org 2011/09/30 00:47:37 22 - dtucker@cvs.openbsd.org 2011/09/30 00:47:37
23 [sshd.c] 23 [sshd.c]
24 don't attempt privsep cleanup when not using privsep; ok markus@ 24 don't attempt privsep cleanup when not using privsep; ok markus@
25 - djm@cvs.openbsd.org 2011/09/30 21:22:49
26 [sshd.c]
27 fix inverted test that caused logspam; spotted by henning@
25 28
2620110929 2920110929
27 - (djm) [configure.ac defines.h] No need to detect sizeof(char); patch 30 - (djm) [configure.ac defines.h] No need to detect sizeof(char); patch
diff --git a/sshd.c b/sshd.c
index 21cdfa507..c8d71f8fe 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshd.c,v 1.387 2011/09/30 00:47:37 dtucker Exp $ */ 1/* $OpenBSD: sshd.c,v 1.388 2011/09/30 21:22:49 djm Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -2369,7 +2369,7 @@ cleanup_exit(int i)
2369 if (use_privsep && privsep_is_preauth && pmonitor->m_pid > 1) { 2369 if (use_privsep && privsep_is_preauth && pmonitor->m_pid > 1) {
2370 debug("Killing privsep child %d", pmonitor->m_pid); 2370 debug("Killing privsep child %d", pmonitor->m_pid);
2371 if (kill(pmonitor->m_pid, SIGKILL) != 0 && 2371 if (kill(pmonitor->m_pid, SIGKILL) != 0 &&
2372 errno == ESRCH) 2372 errno != ESRCH)
2373 error("%s: kill(%d): %s", __func__, 2373 error("%s: kill(%d): %s", __func__,
2374 pmonitor->m_pid, strerror(errno)); 2374 pmonitor->m_pid, strerror(errno));
2375 } 2375 }