 @@ -1,16 +1,16 @@
-/*	$NetBSD: ifwatchd.c,v 1.40 2016/10/06 11:13:57 roy Exp $	*/
+/*	$NetBSD: ifwatchd.c,v 1.41 2016/10/07 15:49:58 christos Exp $	*/
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: ifwatchd.c,v 1.40 2016/10/06 11:13:57 roy Exp $");
+__RCSID("$NetBSD: ifwatchd.c,v 1.41 2016/10/07 15:49:58 christos Exp $");
 /*-
  * Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Martin Husemann <martin@NetBSD.org>.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -179,27 +179,26 @@ main(int argc, char **argv)
 	while (argc > 0) {
 		list_interfaces(argv[0]);
 		argv++;
 		argc--;
+	}
 	if (!verbose)
 		daemon(0, 0);
 	s = socket(PF_ROUTE, SOCK_RAW, 0);
 	if (s < 0) {
 		syslog(LOG_ERR, "error opening routing socket: %m");
 		perror("open routing socket");
 		exit(EXIT_FAILURE);
+	}
 	if (!inhibit_initial)
 		run_initial_ups();
 	iov[0].iov_base = buf;
 	iov[0].iov_len = sizeof(buf);
 	memset(&msg, 0, sizeof(msg));
 	msg.msg_iov = iov;
 	msg.msg_iovlen = 1;
 	for (;;) {
 @@ -348,49 +347,48 @@ invoke_script(const char *ifname, enum e
 	char addr[NI_MAXHOST], daddr[NI_MAXHOST];
 	const char *script;
 	int status;
 	if (ifname == NULL)
 		return;
 	script = *scripts[ev];
 	if (script == NULL)
 		return;
 	addr[0] = daddr[0] = 0;
 	if (sa != NULL) {
 		const struct sockaddr_in *sin;
 		const struct sockaddr_in6 *sin6;
 		if (sa->sa_len == 0) {
-			fprintf(stderr,
+			syslog(LOG_ERR,
-			    "illegal socket address (sa_len == 0)\n");
+			    "illegal socket address (sa_len == 0)");
 			return;
+		}
 		switch (sa->sa_family) {
 		case AF_INET:
 			const struct sockaddr_in *sin;
 			sin = (const struct sockaddr_in *)sa;
 			if (sin->sin_addr.s_addr == INADDR_ANY ||
 			    sin->sin_addr.s_addr == INADDR_BROADCAST)
 				return;
 			break;
 		case AF_INET6:
 			const struct sockaddr_in6 *sin6;
 			sin6 = (const struct sockaddr_in6 *)sa;
 			if (IN6_IS_ADDR_LINKLOCAL(&sin6->sin6_addr))
 				return;
 			break;
 		default:
 			break;
+		}
 		if (getnameinfo(sa, sa->sa_len, addr, sizeof addr, NULL, 0,
 		    NI_NUMERICHOST)) {
 			if (verbose)
 				printf("getnameinfo failed\n");
 			return;	/* this address can not be handled */
+		}
+	}
 	if (dest != NULL) {
 		if (getnameinfo(dest, dest->sa_len, daddr, sizeof daddr,
 		    NULL, 0, NI_NUMERICHOST)) {
 @@ -399,34 +397,33 @@ invoke_script(const char *ifname, enum e
 			return;	/* this address can not be handled */
+		}
+	}
 	if (verbose)
 		(void) printf("calling: %s %s %s %s %s %s\n",
 		    script, ifname, DummyTTY, DummySpeed, addr, daddr);
 	if (!quiet)
 		syslog(LOG_INFO, "calling: %s %s %s %s %s %s\n",
 		    script, ifname, DummyTTY, DummySpeed, addr, daddr);
 	switch (vfork()) {
 	case -1:
-		fprintf(stderr, "cannot fork\n");
+		syslog(LOG_ERR, "cannot fork: %m");
 		break;
 	case 0:
 		if (execl(script, script, ifname, DummyTTY, DummySpeed,
 		    addr, daddr, NULL) == -1) {
 			syslog(LOG_ERR, "could not execute \"%s\": %m",
 			    script);
 			perror(script);
+		}
 		_exit(EXIT_FAILURE);
 	default:
 		(void) wait(&status);
+	}
+}
 static void
 list_interfaces(const char *ifnames)
+{
 	char * names = strdup(ifnames);
 	char * name, *lasts;
 	static const char sep[] = " \t";