From: bluhm <bluhm@openbsd.org>
Date: Wed, 5 Apr 2017 00:35:02 +0000 (+0000)
Subject: Do not print a warning if closing the control socket fails.  It
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=20f5d3fff25e14af2b147bbce11847207911cbc5;p=openbsd

Do not print a warning if closing the control socket fails.  It
cannot happen and there is nothing that could be done about it.
OK deraadt@
---

diff --git a/usr.sbin/syslogd/syslogd.c b/usr.sbin/syslogd/syslogd.c
index 1e1bfc6fff8..bfc7443b282 100644
--- a/usr.sbin/syslogd/syslogd.c
+++ b/usr.sbin/syslogd/syslogd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: syslogd.c,v 1.233 2017/03/28 00:04:43 jsg Exp $	*/
+/*	$OpenBSD: syslogd.c,v 1.234 2017/04/05 00:35:02 bluhm Exp $	*/
 
 /*
  * Copyright (c) 1983, 1988, 1993, 1994
@@ -3085,8 +3085,7 @@ ctlconn_cleanup(void)
 {
 	struct filed *f;
 
-	if (close(fd_ctlconn) == -1)
-		logerror("close ctlconn");
+	close(fd_ctlconn);
 	fd_ctlconn = -1;
 	event_del(ev_ctlread);
 	event_del(ev_ctlwrite);