[Midnightbsd-cvs] src [8559] trunk/usr.sbin/syslogd/syslogd.c: make sure that errno isnt modified before calling logerror.

[laffer1 at midnightbsd.org]

Revision: 8559
          http://svnweb.midnightbsd.org/src/?rev=8559
Author:   laffer1
Date:     2016-09-19 11:16:23 -0400 (Mon, 19 Sep 2016)
Log Message:
-----------
make sure that errno isnt modified before calling logerror.

Modified Paths:
--------------
    trunk/usr.sbin/syslogd/syslogd.c

Modified: trunk/usr.sbin/syslogd/syslogd.c
===================================================================
--- trunk/usr.sbin/syslogd/syslogd.c	2016-09-19 15:15:45 UTC (rev 8558)
+++ trunk/usr.sbin/syslogd/syslogd.c	2016-09-19 15:16:23 UTC (rev 8559)
@@ -1873,6 +1873,7 @@
 
 			pri = decode(buf, prioritynames);
 			if (pri < 0) {
+				errno = 0;
 				(void)snprintf(ebuf, sizeof ebuf,
 				    "unknown priority name \"%s\"", buf);
 				logerror(ebuf);
@@ -1901,6 +1902,7 @@
 			} else {
 				i = decode(buf, facilitynames);
 				if (i < 0) {
+					errno = 0;
 					(void)snprintf(ebuf, sizeof ebuf,
 					    "unknown facility name \"%s\"",
 					    buf);
@@ -2687,6 +2689,7 @@
 			logerror("socket");
 			continue;
 		}
+#ifdef INET6
 		if (r->ai_family == AF_INET6) {
 			if (setsockopt(*s, IPPROTO_IPV6, IPV6_V6ONLY,
 				       (char *)&on, sizeof (on)) < 0) {
@@ -2695,6 +2698,7 @@
 				continue;
 			}
 		}
+#endif
 		if (setsockopt(*s, SOL_SOCKET, SO_REUSEADDR,
 			       (char *)&on, sizeof (on)) < 0) {
 			logerror("setsockopt");
@@ -2711,8 +2715,8 @@
 		 */
 		if (!NoBind) {
 			if (bind(*s, r->ai_addr, r->ai_addrlen) < 0) {
+				logerror("bind");
 				close(*s);
-				logerror("bind");
 				continue;
 			}