From 2e13560ff59c6a2879fdb5e61915238cf5921988 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Sun, 2 Oct 2011 19:10:13 +1100 Subject: [PATCH] - djm@cvs.openbsd.org 2011/09/30 21:22:49 [sshd.c] fix inverted test that caused logspam; spotted by henning@ --- ChangeLog | 3 +++ sshd.c | 4 ++-- 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 @@ - 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 diff --git a/sshd.c b/sshd.c index 21cdfa507..c8d71f8fe 100644 --- a/sshd.c +++ b/sshd.c @@ -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 * Copyright (c) 1995 Tatu Ylonen , 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)); }