diff options
author | Darren Tucker <dtucker@zip.com.au> | 2011-10-02 19:10:13 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2011-10-02 19:10:13 +1100 |
commit | 2e13560ff59c6a2879fdb5e61915238cf5921988 (patch) | |
tree | 10679233272ed8f63f95d351f7ae4fc3cce60bfe | |
parent | 95125e5f43f73e1c325c85b9571d80b228b963d8 (diff) |
- djm@cvs.openbsd.org 2011/09/30 21:22:49
[sshd.c]
fix inverted test that caused logspam; spotted by henning@
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | sshd.c | 4 |
2 files changed, 5 insertions, 2 deletions
@@ -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 | ||
26 | 20110929 | 29 | 20110929 |
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 |
@@ -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 | } |