- djm@cvs.openbsd.org 2011/09/30 21:22:49

[sshd.c]
     fix inverted test that caused logspam; spotted by henning@
This commit is contained in:
Darren Tucker 2011-10-02 19:10:13 +11:00
parent 95125e5f43
commit 2e13560ff5
2 changed files with 5 additions and 2 deletions

View File

@ -22,6 +22,9 @@
- dtucker@cvs.openbsd.org 2011/09/30 00:47:37
[sshd.c]
don't attempt privsep cleanup when not using privsep; ok markus@
- djm@cvs.openbsd.org 2011/09/30 21:22:49
[sshd.c]
fix inverted test that caused logspam; spotted by henning@
20110929
- (djm) [configure.ac defines.h] No need to detect sizeof(char); patch

4
sshd.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: sshd.c,v 1.387 2011/09/30 00:47:37 dtucker Exp $ */
/* $OpenBSD: sshd.c,v 1.388 2011/09/30 21:22:49 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -2369,7 +2369,7 @@ cleanup_exit(int i)
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)
errno != ESRCH)
error("%s: kill(%d): %s", __func__,
pmonitor->m_pid, strerror(errno));
}