From a4fe86f85e4d175ead0be0a9fd132d256601dfec Mon Sep 17 00:00:00 2001
From: bluhm <bluhm@openbsd.org>
Date: Sun, 26 Mar 2017 18:38:16 +0000
Subject: After my previous commit, file descriptor fd_sendsys may be -1 if
 socketpair(2) has failed.  Do not call ioctl(LIOCSFD) in this case. OK
 millert@

---
 usr.sbin/syslogd/syslogd.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'usr.sbin/syslogd')

diff --git a/usr.sbin/syslogd/syslogd.c b/usr.sbin/syslogd/syslogd.c
index 67998959fe9..3910c1c2125 100644
--- a/usr.sbin/syslogd/syslogd.c
+++ b/usr.sbin/syslogd/syslogd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: syslogd.c,v 1.231 2017/03/24 22:13:00 bluhm Exp $	*/
+/*	$OpenBSD: syslogd.c,v 1.232 2017/03/26 18:38:16 bluhm Exp $	*/
 
 /*
  * Copyright (c) 1983, 1988, 1993, 1994
@@ -565,11 +565,12 @@ main(int argc, char *argv[])
 
 	if ((fd_klog = open(_PATH_KLOG, O_RDONLY, 0)) == -1) {
 		logdebug("can't open %s (%d)\n", _PATH_KLOG, errno);
-	} else {
+	} else if (fd_sendsys != -1) {
 		if (ioctl(fd_klog, LIOCSFD, &pair[1]) == -1)
 			logdebug("LIOCSFD errno %d\n", errno);
 	}
-	close(pair[1]);
+	if (fd_sendsys != -1)
+		close(pair[1]);
 
 	if (tls_init() == -1) {
 		logerrorx("tls_init");
-- 
cgit v1.2.3-59-g8ed1b