 @@ -1,14 +1,14 @@
-/*	$NetBSD: inetd.c,v 1.133 2021/09/03 19:33:51 rillig Exp $	*/
+/*	$NetBSD: inetd.c,v 1.134 2021/09/03 20:24:28 rillig Exp $	*/
 /*-
  * Copyright (c) 1998, 2003 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center and by Matthias Scheler.
+ *
  * 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
 @@ -56,27 +56,27 @@
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1983, 1991, 1993, 1994\
  The Regents of the University of California.  All rights reserved.");
 #if 0
 static char sccsid[] = "@(#)inetd.c	8.4 (Berkeley) 4/13/94";
 #else
-__RCSID("$NetBSD: inetd.c,v 1.133 2021/09/03 19:33:51 rillig Exp $");
+__RCSID("$NetBSD: inetd.c,v 1.134 2021/09/03 20:24:28 rillig Exp $");
 #endif
 #endif /* not lint */
 /*
  * Inetd - Internet super-server
+ *
  * This program invokes all internet services as needed.  Connection-oriented
  * services are invoked each time a connection is made, by creating a process.
  * This process is passed the connection as file descriptor 0 and is expected
  * to do a getpeername to find out the source host and port.
+ *
  * Datagram oriented services are invoked when a datagram
  * arrives; a process is created and passed a pending message
 @@ -327,48 +327,48 @@ static void	clear_ip_list(struct servtab
 static time_t	rl_time(void);
 static void	rl_get_name(struct servtab *, int, char *);
 static void	rl_drop_connection(struct servtab *, int);
 struct biltin {
 	const char *bi_service;		/* internally provided service name */
 	int	bi_socktype;		/* type of socket supported */
 	short	bi_fork;		/* 1 if should fork before call */
 	short	bi_wait;		/* 1 if should wait for child */
 	void	(*bi_fn)(int, struct servtab *);
 					/* function which performs it */
 } biltins[] = {
 	/* Echo received data */
-	{ "echo",	SOCK_STREAM,	1, 0,	echo_stream },
+	{ "echo",	SOCK_STREAM,	true, false,	echo_stream },
-	{ "echo",	SOCK_DGRAM,	0, 0,	echo_dg },
+	{ "echo",	SOCK_DGRAM,	false, false,	echo_dg },
 	/* Internet /dev/null */
-	{ "discard",	SOCK_STREAM,	1, 0,	discard_stream },
+	{ "discard",	SOCK_STREAM,	true, false,	discard_stream },
-	{ "discard",	SOCK_DGRAM,	0, 0,	discard_dg },
+	{ "discard",	SOCK_DGRAM,	false, false,	discard_dg },
 	/* Return 32 bit time since 1970 */
-	{ "time",	SOCK_STREAM,	0, 0,	machtime_stream },
+	{ "time",	SOCK_STREAM,	false, false,	machtime_stream },
-	{ "time",	SOCK_DGRAM,	0, 0,	machtime_dg },
+	{ "time",	SOCK_DGRAM,	false, false,	machtime_dg },
 	/* Return human-readable time */
-	{ "daytime",	SOCK_STREAM,	0, 0,	daytime_stream },
+	{ "daytime",	SOCK_STREAM,	false, false,	daytime_stream },
-	{ "daytime",	SOCK_DGRAM,	0, 0,	daytime_dg },
+	{ "daytime",	SOCK_DGRAM,	false, false,	daytime_dg },
 	/* Familiar character generator */
-	{ "chargen",	SOCK_STREAM,	1, 0,	chargen_stream },
+	{ "chargen",	SOCK_STREAM,	true, false,	chargen_stream },
-	{ "chargen",	SOCK_DGRAM,	0, 0,	chargen_dg },
+	{ "chargen",	SOCK_DGRAM,	false, false,	chargen_dg },
-	{ "tcpmux",	SOCK_STREAM,	1, 0,	tcpmux },
+	{ "tcpmux",	SOCK_STREAM,	true, false,	tcpmux },
-	{ NULL, 0, 0, 0, NULL }
+	{ NULL, 0, false, false, NULL }
 };
 /* list of "bad" ports. I.e. ports that are most obviously used for
  * "cycling packets" denial of service attacks. See /etc/services.
  * List must end with port number "0".
  */
 u_int16_t bad_ports[] =  { 7, 9, 13, 19, 37, 0 };
 #define NUMINT	(sizeof(intab) / sizeof(struct inent))
 const char	*CONFIG = _PATH_INETDCONF;
 @@ -379,32 +379,32 @@ int
 main(int argc, char *argv[])
+{
 	int		ch, n, reload = 1;
 	while ((ch = getopt(argc, argv,
 #ifdef LIBWRAP
 					"dl"
 #else
 					"d"
 #endif
 					   )) != -1)
 		switch(ch) {
 		case 'd':
-			debug = 1;
+			debug = true;
 			options |= SO_DEBUG;
 			break;
 #ifdef LIBWRAP
 		case 'l':
-			lflag = 1;
+			lflag = true;
 			break;
 #endif
 		case '?':
 		default:
 			usage();
+		}
 	argc -= optind;
 	argv += optind;
 	if (argc > 0)
 		CONFIG = argv[0];
 	if (!debug)
 @@ -438,220 +438,220 @@ main(int argc, char *argv[])
 			ev = allocchange();
 			EV_SET(ev, signum, EVFILT_SIGNAL, EV_ADD | EV_ENABLE,
 , 0, 0);
+		}
+	}
 	for (;;) {
 		int		ctrl;
 		struct kevent	eventbuf[64], *ev;
 		struct servtab	*sep;
 		if (reload) {
-			reload = 0;
+			reload = false;
 			config_root();
+		}
 		n = my_kevent(changebuf, changes, eventbuf, __arraycount(eventbuf));
 		changes = 0;
 		for (ev = eventbuf; n > 0; ev++, n--) {
 			if (ev->filter == EVFILT_SIGNAL) {
 				switch (ev->ident) {
 				case SIGALRM:
 					retry();
 					break;
 				case SIGCHLD:
 					reapchild();
 					break;
 				case SIGTERM:
 				case SIGINT:
 					goaway();
 					break;
 				case SIGHUP:
-					reload = 1;
+					reload = true;
 					break;
+				}
 				continue;
+			}
 			if (ev->filter != EVFILT_READ)
 				continue;
 			sep = (struct servtab *)ev->udata;
 			/* Paranoia */
 			if ((int)ev->ident != sep->se_fd)
 				continue;
 			DPRINTF(SERV_FMT ": service requested" , SERV_PARAMS(sep));
-			if (!sep->se_wait && sep->se_socktype == SOCK_STREAM) {
+			if (sep->se_wait == 0 && sep->se_socktype == SOCK_STREAM) {
 				/* XXX here do the libwrap check-before-accept*/
 				ctrl = accept(sep->se_fd, NULL, NULL);
 				DPRINTF(SERV_FMT ": accept, ctrl fd %d",
 				    SERV_PARAMS(sep), ctrl);
 				if (ctrl < 0) {
 					if (errno != EINTR)
 						syslog(LOG_WARNING,
 						    SERV_FMT ": accept: %m",
 						    SERV_PARAMS(sep));
 					continue;
+				}
 			} else
 				ctrl = sep->se_fd;
 			spawn(sep, ctrl);
+		}
+	}
+}
 static void
 spawn(struct servtab *sep, int ctrl)
+{
 	int dofork;
 	pid_t pid;
 	pid = 0;
 #ifdef LIBWRAP_INTERNAL
-	dofork = 1;
+	dofork = true;
 #else
-	dofork = (sep->se_bi == 0 || sep->se_bi->bi_fork);
+	dofork = (sep->se_bi == NULL || sep->se_bi->bi_fork);
 #endif
 	if (dofork) {
 		if (rl_process(sep, ctrl)) {
 			return;
+		}
 		pid = fork();
 		if (pid < 0) {
 			syslog(LOG_ERR, "fork: %m");
-			if (!sep->se_wait && sep->se_socktype == SOCK_STREAM)
+			if (sep->se_wait == 0 && sep->se_socktype == SOCK_STREAM)
 				close(ctrl);
 			sleep(1);
 			return;
+		}
-		if (pid != 0 && sep->se_wait) {
+		if (pid != 0 && sep->se_wait != 0) {
 			struct kevent	*ev;
 			sep->se_wait = pid;
 			ev = allocchange();
 			EV_SET(ev, sep->se_fd, EVFILT_READ,
 			    EV_DELETE, 0, 0, 0);
+		}
 		if (pid == 0) {
 			size_t	n;
 			for (n = 0; n < __arraycount(my_signals); n++)
 				(void) signal(my_signals[n], SIG_DFL);
 			if (debug)
 				setsid();
+		}
+	}
 	if (pid == 0) {
 		run_service(ctrl, sep, dofork);
 		if (dofork)
 			exit(0);
+	}
-	if (!sep->se_wait && sep->se_socktype == SOCK_STREAM)
+	if (sep->se_wait == 0 && sep->se_socktype == SOCK_STREAM)
 		close(ctrl);
+}
 static void
 run_service(int ctrl, struct servtab *sep, int didfork)
+{
 	struct passwd *pwd;
 	struct group *grp = NULL;	/* XXX gcc */
 	char buf[NI_MAXSERV];
 	struct servtab *s;
 #ifdef LIBWRAP
 	char abuf[BUFSIZ];
 	struct request_info req;
 	int denied;
 	char *service = NULL;	/* XXX gcc */
 #endif
 #ifdef LIBWRAP
 #ifndef LIBWRAP_INTERNAL
 	if (sep->se_bi == 0)
 #endif
-	if (!sep->se_wait && sep->se_socktype == SOCK_STREAM) {
+	if (sep->se_wait == 0 && sep->se_socktype == SOCK_STREAM) {
-		request_init(&req, RQ_DAEMON, sep->se_argv[0] ?
+		request_init(&req, RQ_DAEMON, sep->se_argv[0] != NULL ?
 		    sep->se_argv[0] : sep->se_service, RQ_FILE, ctrl, NULL);
 		fromhost(&req);
-		denied = !hosts_access(&req);
+		denied = hosts_access(&req) == 0;
 		if (denied || lflag) {
 			if (getnameinfo(&sep->se_ctrladdr,
 			    (socklen_t)sep->se_ctrladdr.sa_len, NULL, 0,
 			    buf, sizeof(buf), 0) != 0) {
 				/* shouldn't happen */
 				(void)snprintf(buf, sizeof buf, "%d",
 				    ntohs(sep->se_ctrladdr_in.sin_port));
+			}
 			service = buf;
-			if (req.client->sin) {
+			if (req.client->sin != NULL) {
 				sockaddr_snprintf(abuf, sizeof(abuf), "%a",
 				    req.client->sin);
 			} else {
 				strcpy(abuf, "(null)");
+			}
+		}
 		if (denied) {
 			syslog(deny_severity,
 			    "refused connection from %.500s(%s), service %s (%s)",
 			    eval_client(&req), abuf, service, sep->se_proto);
 			goto reject;
+		}
 		if (lflag) {
 			syslog(allow_severity,
 			    "connection from %.500s(%s), service %s (%s)",
 			    eval_client(&req), abuf, service, sep->se_proto);
+		}
+	}
 #endif /* LIBWRAP */
-	if (sep->se_bi) {
+	if (sep->se_bi != NULL) {
 		if (didfork) {
-			for (s = servtab; s; s = s->se_next)
+			for (s = servtab; s != NULL; s = s->se_next)
 				if (s->se_fd != -1 && s->se_fd != ctrl) {
 					close(s->se_fd);
 					s->se_fd = -1;
+				}
+		}
 		(*sep->se_bi->bi_fn)(ctrl, sep);
 	} else {
 		if ((pwd = getpwnam(sep->se_user)) == NULL) {
 			syslog(LOG_ERR, "%s/%s: %s: No such user",
 			    sep->se_service, sep->se_proto, sep->se_user);
 			goto reject;
+		}
-		if (sep->se_group &&
+		if (sep->se_group != NULL &&
 		    (grp = getgrnam(sep->se_group)) == NULL) {
 			syslog(LOG_ERR, "%s/%s: %s: No such group",
 			    sep->se_service, sep->se_proto, sep->se_group);
 			goto reject;
+		}
-		if (pwd->pw_uid) {
+		if (pwd->pw_uid != 0) {
-			if (sep->se_group)
+			if (sep->se_group != NULL)
 				pwd->pw_gid = grp->gr_gid;
 			if (setgid(pwd->pw_gid) < 0) {
 				syslog(LOG_ERR,
 				 "%s/%s: can't set gid %d: %m", sep->se_service,
 				    sep->se_proto, pwd->pw_gid);
 				goto reject;
+			}
 			(void) initgroups(pwd->pw_name,
 			    pwd->pw_gid);
 			if (setuid(pwd->pw_uid) < 0) {
 				syslog(LOG_ERR,
 				 "%s/%s: can't set uid %d: %m", sep->se_service,
 				    sep->se_proto, pwd->pw_uid);
 				goto reject;
+			}
-		} else if (sep->se_group) {
+		} else if (sep->se_group != NULL) {
 			(void) setgid((gid_t)grp->gr_gid);
+		}
 		DPRINTF("%d execl %s",
 		    getpid(), sep->se_server);
 		/* Set our control descriptor to not close-on-exec... */
 		if (fcntl(ctrl, F_SETFD, 0) < 0)
 			syslog(LOG_ERR, "fcntl (%d, F_SETFD, 0): %m", ctrl);
 		/* ...and dup it to stdin, stdout, and stderr. */
 		if (ctrl != 0) {
 			dup2(ctrl, 0);
 			close(ctrl);
 			ctrl = 0;
+		}
 @@ -816,90 +816,90 @@ config(void)
 			char *host;
 			const char *port;
 			int error;
 			int s;
 			/* check if the family is supported */
 			s = socket(sep->se_family, SOCK_DGRAM, 0);
 			if (s < 0) {
 				syslog(LOG_WARNING,
 				    "%s/%s: %s: the address family is not "
 				    "supported by the kernel",
 				    sep->se_service, sep->se_proto,
 				    sep->se_hostaddr);
-				sep->se_checked = 0;
+				sep->se_checked = false;
 				continue;
+			}
 			close(s);
 			memset(&hints, 0, sizeof(hints));
 			hints.ai_family = sep->se_family;
 			hints.ai_socktype = sep->se_socktype;
 			hints.ai_flags = AI_PASSIVE;
-			if (!strcmp(sep->se_hostaddr, "*"))
+			if (strcmp(sep->se_hostaddr, "*") == 0)
 				host = NULL;
 			else
 				host = sep->se_hostaddr;
 			if (isrpcservice(sep) || ISMUX(sep))
 				port = "0";
 			else
 				port = sep->se_service;
 			error = getaddrinfo(host, port, &hints, &res);
-			if (error) {
+			if (error != 0) {
 				if (error == EAI_SERVICE) {
 					/* gai_strerror not friendly enough */
 					syslog(LOG_WARNING, SERV_FMT ": "
 					    "unknown service",
 					    SERV_PARAMS(sep));
 				} else {
 					syslog(LOG_ERR, SERV_FMT ": %s: %s",
 					    SERV_PARAMS(sep),
 					    sep->se_hostaddr,
 					    gai_strerror(error));
+				}
-				sep->se_checked = 0;
+				sep->se_checked = false;
 				continue;
+			}
-			if (res->ai_next) {
+			if (res->ai_next != NULL) {
 				syslog(LOG_ERR,
 					SERV_FMT ": %s: resolved to multiple addr",
 				    SERV_PARAMS(sep),
 				    sep->se_hostaddr);
-				sep->se_checked = 0;
+				sep->se_checked = false;
 				freeaddrinfo(res);
 				continue;
+			}
 			memcpy(&sep->se_ctrladdr, res->ai_addr,
 				res->ai_addrlen);
 			if (ISMUX(sep)) {
 				sep->se_fd = -1;
 				freeaddrinfo(res);
 				continue;
+			}
 			sep->se_ctrladdr_size = res->ai_addrlen;
 			freeaddrinfo(res);
 #ifdef RPC
 			if (isrpcservice(sep)) {
 				struct rpcent *rp;
 				sep->se_rpcprog = atoi(sep->se_service);
 				if (sep->se_rpcprog == 0) {
 					rp = getrpcbyname(sep->se_service);
 					if (rp == 0) {
 						syslog(LOG_ERR,
 						    SERV_FMT
 						    ": unknown service",
 						    SERV_PARAMS(sep));
-						sep->se_checked = 0;
+						sep->se_checked = false;
 						continue;
+					}
 					sep->se_rpcprog = rp->r_number;
+				}
 				if (sep->se_fd == -1 && !ISMUX(sep))
 					setup(sep);
 				if (sep->se_fd != -1)
 					register_rpc(sep);
 			} else
 #endif
+			{
 				if (sep->se_fd >= 0)
 					close_sep(sep);
 @@ -907,27 +907,27 @@ config(void)
 					setup(sep);
+			}
+		    }
+		}
+	}
 	endconfig();
+}
 static void
 retry(void)
+{
 	struct servtab *sep;
-	timingout = 0;
+	timingout = false;
 	for (sep = servtab; sep != NULL; sep = sep->se_next) {
 		if (sep->se_fd == -1 && !ISMUX(sep)) {
 			switch (sep->se_family) {
 			case AF_LOCAL:
 			case AF_INET:
 #ifdef INET6
 			case AF_INET6:
 #endif
 				setup(sep);
 				if (sep->se_fd >= 0 && isrpcservice(sep))
 					register_rpc(sep);
 				break;
+			}
 @@ -1026,27 +1026,27 @@ setsockopt(fd, SOL_SOCKET, opt, &on, (so
 			return;
+		}
+	}
 #endif
 	if (bind(sep->se_fd, &sep->se_ctrladdr, sep->se_ctrladdr_size) < 0) {
 		DPRINTF(SERV_FMT ": bind failed: %s",
 			SERV_PARAMS(sep), strerror(errno));
 		syslog(LOG_ERR, SERV_FMT ": bind: %m",
 		    SERV_PARAMS(sep));
 		(void) close(sep->se_fd);
 		sep->se_fd = -1;
 		if (!timingout) {
-			timingout = 1;
+			timingout = true;
 			alarm(RETRYTIME);
+		}
 		return;
+	}
 	if (sep->se_socktype == SOCK_STREAM)
 		listen(sep->se_fd, 10);
 	/* Set the accept filter, if specified. To be done after listen.*/
 	if (sep->se_accf.af_name[0] != 0 && setsockopt(sep->se_fd, SOL_SOCKET,
 	    SO_ACCEPTFILTER, &sep->se_accf,
 	    (socklen_t)sizeof(sep->se_accf)) < 0)
 		syslog(LOG_ERR, "setsockopt(SO_ACCEPTFILTER %s): %m",
 		    sep->se_accf.af_name);
 @@ -1099,51 +1099,51 @@ register_rpc(struct servtab *sep)
 		syslog(LOG_ERR, SERV_FMT ": getsockname: %m",
 		    SERV_PARAMS(sep));
 		return;
+	}
 	nbuf.buf = &ss;
 	nbuf.len = ss.ss_len;
 	nbuf.maxlen = sizeof (struct sockaddr_storage);
 	for (n = sep->se_rpcversl; n <= sep->se_rpcversh; n++) {
 		DPRINTF("rpcb_set: %u %d %s %s",
 		    sep->se_rpcprog, n, nconf->nc_netid,
 		    taddr2uaddr(nconf, &nbuf));
 		(void)rpcb_unset((unsigned int)sep->se_rpcprog, (unsigned int)n, nconf);
-		if (!rpcb_set((unsigned int)sep->se_rpcprog, (unsigned int)n, nconf, &nbuf))
+		if (rpcb_set((unsigned int)sep->se_rpcprog, (unsigned int)n, nconf, &nbuf) == 0)
 			syslog(LOG_ERR, "rpcb_set: %u %d %s %s%s",
 			    sep->se_rpcprog, n, nconf->nc_netid,
 			    taddr2uaddr(nconf, &nbuf), clnt_spcreateerror(""));
+	}
 #endif /* RPC */
+}
 static void
 unregister_rpc(struct servtab *sep)
+{
 #ifdef RPC
 	int n;
 	struct netconfig *nconf;
 	if ((nconf = getnetconfigent(sep->se_proto+4)) == NULL) {
 		syslog(LOG_ERR, "%s: getnetconfigent failed",
 		    sep->se_proto);
 		return;
+	}
 	for (n = sep->se_rpcversl; n <= sep->se_rpcversh; n++) {
 		DPRINTF("rpcb_unset(%u, %d, %s)",
 		    sep->se_rpcprog, n, nconf->nc_netid);
-		if (!rpcb_unset((unsigned int)sep->se_rpcprog, (unsigned int)n, nconf))
+		if (rpcb_unset((unsigned int)sep->se_rpcprog, (unsigned int)n, nconf) == 0)
 			syslog(LOG_ERR, "rpcb_unset(%u, %d, %s) failed\n",
 			    sep->se_rpcprog, n, nconf->nc_netid);
+	}
 #endif /* RPC */
+}
 static struct servtab *
 enter(struct servtab *cp)
+{
 	struct servtab *sep;
 	sep = malloc(sizeof (*sep));
 @@ -1279,27 +1279,27 @@ more:
 			include_configs(arg);
 			goto more;
 		} else {
 			ERR("Unknown directive '%s'", &arg[1]);
 			goto more;
+		}
+	}
 	/* After this point, we might need to store data in a servtab */
 	*sep = init_servtab();
 	/* Check for a host name. */
 	hostdelim = strrchr(arg, ':');
-	if (hostdelim) {
+	if (hostdelim != NULL) {
 		*hostdelim = '\0';
 		if (arg[0] == '[' && hostdelim > arg && hostdelim[-1] == ']') {
 			hostdelim[-1] = '\0';
 			sep->se_hostaddr = newstr(arg + 1);
 		} else
 			sep->se_hostaddr = newstr(arg);
 		arg = hostdelim + 1;
 		/*
 		 * If the line is of the form `host:', then just change the
 		 * default host for the following lines.
 		 */
 		if (*arg == '\0') {
 			arg = skip(&cp);
 @@ -1402,60 +1402,58 @@ more:
 	if (sep->se_type == NORM_TYPE &&
 	    strncmp(arg, "faith/", strlen("faith/")) == 0) {
 		arg += strlen("faith/");
 		sep->se_type = FAITH_TYPE;
+	}
 	sep->se_proto = newstr(arg);
 #define	MALFORMED(arg) \
 do { \
 	ERR("%s: malformed buffer size option `%s'", \
 	    sep->se_service, (arg)); \
 	freeconfig(sep); \
 	goto more; \
-	/*NOTREACHED*/ \
+} while (false)
 } while (/*CONSTCOND*/0)
 #define	GETVAL(arg) \
 do { \
 	if (!isdigit((unsigned char)*(arg))) \
 		MALFORMED(arg); \
 	val = (int)strtol((arg), &cp0, 10); \
 	if (cp0 != NULL) { \
 		if (cp0[1] != '\0') \
 			MALFORMED((arg)); \
 		if (cp0[0] == 'k') \
 			val *= 1024; \
 		if (cp0[0] == 'm') \
 			val *= 1024 * 1024; \
 	} \
 	if (val < 1) { \
 		ERR("%s: invalid buffer size `%s'", \
 		    sep->se_service, (arg)); \
 		freeconfig(sep); \
 		goto more; \
 	} \
-	/*NOTREACHED*/ \
+} while (false)
 } while (/*CONSTCOND*/0)
 #define	ASSIGN(arg) \
 do { \
 	if (strcmp((arg), "sndbuf") == 0) \
 		sep->se_sndbuf = val; \
 	else if (strcmp((arg), "rcvbuf") == 0) \
 		sep->se_rcvbuf = val; \
 	else \
 		MALFORMED((arg)); \
-} while (/*CONSTCOND*/0)
+} while (false)
 	/*
 	 * Extract the send and receive buffer sizes before parsing
 	 * the protocol.
 	 */
 	sep->se_sndbuf = sep->se_rcvbuf = 0;
 	buf0 = buf1 = sz0 = sz1 = NULL;
 	if ((buf0 = strchr(sep->se_proto, ',')) != NULL) {
 		/* Not meaningful for Tcpmux services. */
 		if (ISMUX(sep)) {
 			ERR("%s: can't specify buffer sizes for "
 			    "tcpmux services", sep->se_service);
 			goto more;
 @@ -1573,34 +1571,34 @@ do { \
 	/* Parser server-program (path to binary or "internal") */
 	arg = skip(&cp);
 	if (arg == NULL) {
 		LOG_TOO_FEW_ARGS();
 		freeconfig(sep);
 		goto more;
+	}
 	if (parse_server(sep, arg)) {
 		freeconfig(sep);
 		goto more;
+	}
 	argc = 0;
-	for (arg = skip(&cp); cp; arg = skip(&cp)) {
+	for (arg = skip(&cp); cp != NULL; arg = skip(&cp)) {
 		if (argc < MAXARGV)
 			sep->se_argv[argc++] = newstr(arg);
+	}
 	while (argc <= MAXARGV)
 		sep->se_argv[argc++] = NULL;
 #ifdef IPSEC
-	sep->se_policy = policy ? newstr(policy) : NULL;
+	sep->se_policy = policy != NULL ? newstr(policy) : NULL;
 #endif
 	/* getconfigent read a positional service def, move to next line */
 	*current_pos = nextline(fconfig);
 	return (sep);
+}
 void
 freeconfig(struct servtab *cp)
+{
 	int i;
 	if (cp->se_hostaddr)
 		free(cp->se_hostaddr);
 @@ -1646,59 +1644,59 @@ again:
 		int c;
 		c = getc(fconfig);
 		(void) ungetc(c, fconfig);
 		if (c == ' ' || c == '\t')
 			if ((cp = nextline(fconfig)) != NULL)
 				goto again;
 		*cpp = NULL;
 		return (NULL);
+	}
 	start = cp;
 	/* Parse shell-style quotes */
 	quote = '\0';
-	while (*cp && (quote || (*cp != ' ' && *cp != '\t'))) {
+	while (*cp != '\0' && (quote != '\0' || (*cp != ' ' && *cp != '\t'))) {
 		if (*cp == '\'' || *cp == '"') {
-			if (quote && *cp != quote)
+			if (quote != '\0' && *cp != quote)
 				cp++;
 			else {
-				if (quote)
+				if (quote != '\0')
 					quote = '\0';
 				else
 					quote = *cp;
 				memmove(cp, cp+1, strlen(cp));
+			}
 		} else
 			cp++;
+	}
 	if (*cp != '\0')
 		*cp++ = '\0';
 	*cpp = cp;
 	return (start);
+}
 char *
 nextline(FILE *fd)
+{
 	char *cp;
 	if (fgets(line, (int)sizeof(line), fd) == NULL) {
-		if (ferror(fd)) {
+		if (ferror(fd) != 0) {
 			ERR("Error when reading next line: %s", strerror(errno));
+		}
 		return NULL;
+	}
 	cp = strchr(line, '\n');
-	if (cp)
+	if (cp != NULL)
 		*cp = '\0';
 	line_number++;
 	return line;
+}
 char *
 newstr(const char *cp)
+{
 	char *dp;
 	if ((dp = strdup((cp != NULL) ? cp : "")) != NULL)
 		return (dp);
 	syslog(LOG_ERR, "strdup: %m");
 	exit(EXIT_FAILURE);
 @@ -1827,27 +1825,27 @@ initring(void)
 		if (isprint(i))
 			*endring++ = (char)i;
+}
 /* ARGSUSED */
 static void
 chargen_stream(int s, struct servtab *sep)	/* Character generator */
+{
 	size_t len;
 	char *rs, text[LINESIZ+2];
 	inetd_setproctitle(sep->se_service, s);
-	if (!endring) {
+	if (endring == NULL) {
 		initring();
 		rs = ring;
+	}
 	text[LINESIZ] = '\r';
 	text[LINESIZ + 1] = '\n';
 	for (rs = ring;;) {
 		if ((len = (size_t)(endring - rs)) >= LINESIZ)
 			memmove(text, rs, LINESIZ);
 		else {
 			memmove(text, rs, len);
 			memmove(text + len, ring, LINESIZ - len);
+		}
 @@ -1996,43 +1994,43 @@ print_service(const char *action, struct
 	if (isrpcservice(sep))
 		fprintf(stderr,
 		    "%s: %s rpcprog=%d, rpcvers = %d/%d, proto=%s, wait.max=%d.%zu, user:group=%s:%s builtin=%lx server=%s"
 #ifdef IPSEC
 		    " policy=\"%s\""
 #endif
 		    "\n",
 		    action, sep->se_service,
 		    sep->se_rpcprog, sep->se_rpcversh, sep->se_rpcversl, sep->se_proto,
 		    sep->se_wait, sep->se_service_max, sep->se_user, sep->se_group,
 		    (long)sep->se_bi, sep->se_server
 #ifdef IPSEC
-		    , (sep->se_policy ? sep->se_policy : "")
+		    , (sep->se_policy != NULL ? sep->se_policy : "")
 #endif
 		    );
 	else
 		fprintf(stderr,
 		    "%s: %s:%s proto=%s%s, wait.max=%d.%zu, user:group=%s:%s builtin=%lx server=%s"
 #ifdef IPSEC
 		    " policy=%s"
 #endif
 		    "\n",
 		    action, sep->se_hostaddr, sep->se_service,
 		    sep->se_type == FAITH_TYPE ? "faith/" : "",
 		    sep->se_proto,
 		    sep->se_wait, sep->se_service_max, sep->se_user, sep->se_group,
 		    (long)sep->se_bi, sep->se_server
 #ifdef IPSEC
-		    , (sep->se_policy ? sep->se_policy : "")
+		    , (sep->se_policy != NULL ? sep->se_policy : "")
 #endif
 		    );
+}
 #endif
 static void
 usage(void)
+{
 #ifdef LIBWRAP
 	(void)fprintf(stderr, "usage: %s [-dl] [conf]\n", getprogname());
 #else
 	(void)fprintf(stderr, "usage: %s [-d] [conf]\n", getprogname());
 #endif
 @@ -2080,47 +2078,47 @@ tcpmux(int ctrl, struct servtab *sep)
 	/* Get requested service name */
 	if ((len = get_line(ctrl, service, MAX_SERV_LEN)) < 0) {
 		strwrite(ctrl, "-Error reading service name\r\n");
 		goto reject;
+	}
 	service[len] = '\0';
 	DPRINTF("tcpmux: %s: service requested", service);
 	/*
 	 * Help is a required command, and lists available services,
 	 * one per line.
 	 */
-	if (!strcasecmp(service, "help")) {
+	if (strcasecmp(service, "help") == 0) {
 		strwrite(ctrl, "+Available services:\r\n");
 		strwrite(ctrl, "help\r\n");
 		for (sep = servtab; sep != NULL; sep = sep->se_next) {
 			if (!ISMUX(sep))
 				continue;
 			(void)write(ctrl, sep->se_service,
 			    strlen(sep->se_service));
 			strwrite(ctrl, "\r\n");
+		}
 		goto reject;
+	}
 	/* Try matching a service in inetd.conf with the request */
 	for (sep = servtab; sep != NULL; sep = sep->se_next) {
 		if (!ISMUX(sep))
 			continue;
-		if (!strcasecmp(service, sep->se_service)) {
+		if (strcasecmp(service, sep->se_service) == 0) {
 			if (ISMUXPLUS(sep))
 				strwrite(ctrl, "+Go\r\n");
-			run_service(ctrl, sep, 1 /* forked */);
+			run_service(ctrl, sep, true /* forked */);
 			return;
+		}
+	}
 	strwrite(ctrl, "-Service not available\r\n");
 reject:
 	_exit(EXIT_FAILURE);
+}
 /*
  * check if the address/port where send data to is one of the obvious ports
  * that are used for denial of service attacks like two echo ports
  * just echoing data between them
  */
 @@ -2160,66 +2158,66 @@ port_good_dg(struct sockaddr *sa)
 		in6 = &sin6->sin6_addr;
 		port = ntohs(sin6->sin6_port);
 		if (IN6_IS_ADDR_MULTICAST(in6) || IN6_IS_ADDR_UNSPECIFIED(in6))
 			goto bad;
 		if (IN6_IS_ADDR_V4MAPPED(in6) || IN6_IS_ADDR_V4COMPAT(in6)) {
 			memcpy(&in, &in6->s6_addr[12], sizeof(in));
 			in.s_addr = ntohl(in.s_addr);
 			goto v4chk;
+		}
 		break;
 #endif
 	default:
 		/* XXX unsupported af, is it safe to assume it to be safe? */
-		return (1);
+		return true;
+	}
 	for (i = 0; bad_ports[i] != 0; i++) {
 		if (port == bad_ports[i])
 			goto bad;
+	}
-	return (1);
+	return true;
 bad:
 	if (getnameinfo(sa, sa->sa_len, hbuf, (socklen_t)sizeof(hbuf), NULL, 0,
 	    niflags) != 0)
 		strlcpy(hbuf, "?", sizeof(hbuf));
 	syslog(LOG_WARNING,"Possible DoS attack from %s, Port %d",
 		hbuf, port);
-	return (0);
+	return false;
+}
 /* XXX need optimization */
 static int
 dg_broadcast(struct in_addr *in)
+{
 	struct ifaddrs *ifa, *ifap;
 	struct sockaddr_in *sin;
 	if (getifaddrs(&ifap) < 0)
-		return (0);
+		return false;
-	for (ifa = ifap; ifa; ifa = ifa->ifa_next) {
+	for (ifa = ifap; ifa != NULL; ifa = ifa->ifa_next) {
 		if (ifa->ifa_addr->sa_family != AF_INET ||
 		    (ifa->ifa_flags & IFF_BROADCAST) == 0)
 			continue;
 		sin = (struct sockaddr_in *)(void *)ifa->ifa_broadaddr;
 		if (sin->sin_addr.s_addr == in->s_addr) {
 			freeifaddrs(ifap);
-			return (1);
+			return true;
+		}
+	}
 	freeifaddrs(ifap);
-	return (0);
+	return false;
+}
 static int
 my_kevent(const struct kevent *changelist, size_t nchanges,
     struct kevent *eventlist, size_t nevents)
+{
 	int	result;
 	while ((result = kevent(kq, changelist, nchanges, eventlist, nevents,
 	    NULL)) < 0)
 		if (errno != EINTR) {
 			syslog(LOG_ERR, "kevent: %m");
 			exit(EXIT_FAILURE);
 @@ -2235,27 +2233,27 @@ allocchange(void)
 		(void) my_kevent(changebuf, __arraycount(changebuf), NULL, 0);
 		changes = 0;
+	}
 	return (&changebuf[changes++]);
+}
 static void
 config_root(void)
+{
 	struct servtab *sep;
 	/* Uncheck services */
 	for (sep = servtab; sep != NULL; sep = sep->se_next) {
-		sep->se_checked = 0;
+		sep->se_checked = false;
+	}
 	defhost = newstr("*");
 #ifdef IPSEC
 	policy = NULL;
 #endif
 	fconfig = NULL;
 	config();
 	purge_unchecked();
+}
 static void
 purge_unchecked(void)
+{
 @@ -2294,27 +2292,27 @@ is_same_service(const struct servtab *se
 	    sep->se_family == cp->se_family &&
 	    ISMUX(sep) == ISMUX(cp);
+}
 int
 parse_protocol(struct servtab *sep)
+{
 	int val;
 	if (strcmp(sep->se_proto, "unix") == 0) {
 		sep->se_family = AF_LOCAL;
 	} else {
 		val = (int)strlen(sep->se_proto);
-		if (!val) {
+		if (val == 0) {
 			ERR("%s: invalid protocol specified",
 			    sep->se_service);
 			return -1;
+		}
 		val = sep->se_proto[val - 1];
 		switch (val) {
 		case '4':	/*tcp4 or udp4*/
 			sep->se_family = AF_INET;
 			break;
 #ifdef INET6
 		case '6':	/*tcp6 or udp6*/
 			sep->se_family = AF_INET6;
 			break;
 @@ -2404,38 +2402,38 @@ parse_server(struct servtab *sep, const
 		return -1;
+	}
 	sep->se_bi = bi;
 	sep->se_wait = bi->bi_wait;
 	return 0;
+}
 /* TODO test to make sure accept filter still works */
 void
 parse_accept_filter(char *arg, struct servtab *sep) {
 	char *accf, *accf_arg;
 	/* one and only one accept filter */
 	accf = strchr(arg, ':');
-	if (!accf)
+	if (accf == NULL)
 		return;
 	if (accf != strrchr(arg, ':') || *(accf + 1) == '\0') {
 		/* more than one ||  nothing beyond */
 		sep->se_socktype = -1;
 		return;
+	}
 	accf++;			/* skip delimiter */
 	strlcpy(sep->se_accf.af_name, accf, sizeof(sep->se_accf.af_name));
 	accf_arg = strchr(accf, ',');
-	if (!accf_arg)		/* zero or one arg, no more */
+	if (accf_arg == NULL)	/* zero or one arg, no more */
 		return;
 	if (strrchr(accf, ',') != accf_arg) {
 		sep->se_socktype = -1;
 	} else {
 		accf_arg++;
 		strlcpy(sep->se_accf.af_arg, accf_arg,
 		    sizeof(sep->se_accf.af_arg));
+	}
+}
 void
 parse_socktype(char* arg, struct servtab* sep)
 @@ -2569,27 +2567,27 @@ read_glob_configs(char *pattern) {
 	for (size_t i = 0; i < results.gl_pathc; i++) {
 		include_matched_path(results.gl_pathv[i]);
+	}
 	globfree(&results);
+}
 static void
 include_matched_path(char *glob_path)
+{
 	struct stat sb;
 	char *tmp;
-	if (lstat(glob_path, &sb)) {
+	if (lstat(glob_path, &sb) != 0) {
 		ERR("Error calling stat on path '%s': %s", glob_path,
 		    strerror(errno));
 		return;
+	}
 	if (!S_ISREG(sb.st_mode) && !S_ISLNK(sb.st_mode)) {
 		DPRINTCONF("'%s' is not a file.", glob_path);
 		ERR("The matched path '%s' is not a regular file", glob_path);
 		return;
+	}
 	DPRINTCONF("Include '%s'", glob_path);
 @@ -2721,27 +2719,27 @@ rl_process(struct servtab *sep, int ctrl
 			    SERV_PARAMS(sep),
 			    sep->se_service_max,
 			    (intmax_t)CNT_INTVL,
 			    (uintmax_t)RETRYTIME);
 			DPRINTF(SERV_FMT ": service not started",
 			    SERV_PARAMS(sep));
 			rl_drop_connection(sep, ctrl);
 			/* Close the server for 10 minutes */
 			close_sep(sep);
 			if (!timingout) {
-				timingout = 1;
+				timingout = true;
 				alarm(RETRYTIME);
+			}
 			return -1;
+		}
+	}
 	if (sep->se_ip_max != SERVTAB_UNSPEC_SIZE_T) {
 		rl_get_name(sep, ctrl, hbuf);
 		node = rl_try_get_ip(sep, hbuf);
 		if(node == NULL) {
 			node = rl_add(sep, hbuf);
+		}
 @@ -2800,27 +2798,27 @@ rl_process(struct servtab *sep, int ctrl
 	sep->se_count++;
 	return 0;
+}
 /* Get the remote's IP address in textual form into hbuf of size NI_MAXHOST */
 static void
 rl_get_name(struct servtab *sep, int ctrl, char *hbuf)
+{
 	struct sockaddr_storage addr;
 	socklen_t len = sizeof(struct sockaddr_storage);
 	switch (sep->se_socktype) {
 	case SOCK_STREAM:
-		if (getpeername(ctrl, (struct sockaddr *)&addr, &len)) {
+		if (getpeername(ctrl, (struct sockaddr *)&addr, &len) != 0) {
 			/* error, log it and skip ip rate limiting */
 			syslog(LOG_ERR,
 				SERV_FMT " failed to get peer name of the "
 				"connection", SERV_PARAMS(sep));
 			exit(EXIT_FAILURE);
+		}
 		break;
 	case SOCK_DGRAM: {
 		struct msghdr header = {
 			.msg_name = &addr,
 			.msg_namelen = sizeof(struct sockaddr_storage),
 			/* scatter/gather and control info is null */
 		};
 @@ -2851,27 +2849,27 @@ rl_get_name(struct servtab *sep, int ctr
 		/* error, log it and skip ip rate limiting */
 		syslog(LOG_ERR,
 		    SERV_FMT ": failed to get name info of the incoming "
 		    "connection; exiting",
 		    SERV_PARAMS(sep));
 		exit(EXIT_FAILURE);
+	}
+}
 static void
 rl_drop_connection(struct servtab *sep, int ctrl)
+{
-	if (!sep->se_wait && sep->se_socktype == SOCK_STREAM) {
+	if (sep->se_wait == 0 && sep->se_socktype == SOCK_STREAM) {
 		/*
 		 * If the fd isn't a listen socket,
 		 * close the individual connection too.
 		 */
 		close(ctrl);
 		return;
+	}
 	if (sep->se_socktype != SOCK_DGRAM) {
 		return;
+	}
 	/*
 	 * Drop the single datagram the service would have
 	 * consumed if nowait. If this is a wait service, this

 @@ -1,25 +1,26 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/6/93
-#	$NetBSD: Makefile,v 1.28 2021/08/30 18:21:11 rillig Exp $
+#	$NetBSD: Makefile,v 1.29 2021/09/03 20:24:28 rillig Exp $
 .include <bsd.own.mk>
 USE_FORT?= yes	# network server
 PROG=	inetd
 SRCS=	inetd.c parse_v2.c
 MAN=	inetd.8
 MLINKS=	inetd.8 inetd.conf.5
 WARNS=	6
 #LINTFLAGS+=	-T
 # Enables debug printouts when in debug mode
 CPPFLAGS+=-DDEBUG_ENABLE
 CPPFLAGS+=-DLIBWRAP
 # Use LIBWRAP_INTERNAL for libwrap checking of inetd's `internal' services.
 #CPPFLAGS+=-DLIBWRAP_INTERNAL
 LDADD+= -lwrap -lblocklist -lutil
 DPADD+= ${LIBWRAP} ${LIBBLOCKLIST} ${LIBUTIL}
 .if (${USE_INET6} != "no")
 CPPFLAGS+=-DINET6
 .endif

 @@ -1,14 +1,14 @@
-/*	$NetBSD: inetd.h,v 1.2 2021/08/30 17:32:23 rillig Exp $	*/
+/*	$NetBSD: inetd.h,v 1.3 2021/09/03 20:24:28 rillig Exp $	*/
 /*-
  * Copyright (c) 1998, 2003 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center and by Matthias Scheler.
+ *
  * 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
 @@ -60,26 +60,27 @@
  */
 #ifndef _INETD_H
 #define _INETD_H
 #include <netinet/in.h>
 #include <sys/socket.h>
 #include <sys/time.h>
 #include <sys/un.h>
 #include <arpa/inet.h>
 #include <netdb.h>
 #include <stdbool.h>
 #include "pathnames.h"
 #ifdef IPSEC
 #include <netipsec/ipsec.h>
 #ifndef IPSEC_POLICY_IPSEC	/* no ipsec support on old ipsec */
 #undef IPSEC
 #endif
 #include "ipsec.h"
 #endif
 typedef enum service_type {
 	NORM_TYPE = 0,
 @@ -99,27 +100,27 @@ typedef enum service_type {
 #define ILV(prio, msg, ...) syslog(prio, CONF_ERROR_FMT msg ".", \
     CONFIG, line_number __VA_OPT__(,) __VA_ARGS__)
 #define WRN(msg, ...) ILV(LOG_WARNING, msg __VA_OPT__(,) __VA_ARGS__)
 #define ERR(msg, ...) ILV(LOG_ERR, msg __VA_OPT__(,) __VA_ARGS__)
 /* Debug logging */
 #ifdef DEBUG_ENABLE
 #define DPRINTF(fmt, ...) do {\
 	if (debug) {\
 		fprintf(stderr, fmt "\n" __VA_OPT__(,) __VA_ARGS__);\
 	}\
-} while (0)
+} while (false)
 #else
 #define DPRINTF(fmt, ...) __nothing
 #endif
 #define DPRINTCONF(fmt, ...) DPRINTF(CONF_ERROR_FMT fmt,\
 	CONFIG, line_number __VA_OPT__(,) __VA_ARGS__)
 #define STRINGIFY(x) #x
 #define TOSTRING(x) STRINGIFY(x)
 struct	servtab {
 	char	*se_hostaddr;		/* host address to listen on */
 	char	*se_service;		/* name of service */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ipsec.c,v 1.6 2021/08/30 17:32:23 rillig Exp $	*/
+/*	$NetBSD: ipsec.c,v 1.7 2021/09/03 20:24:28 rillig Exp $	*/
 /*
  * Copyright (C) 1999 WIDE Project.
  * All rights reserved.
+ *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -26,95 +26,96 @@
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <ctype.h>
 #ifdef IPSEC
 #include <netipsec/ipsec.h>
 #ifndef IPSEC_POLICY_IPSEC	/* no ipsec support on old ipsec */
 #undef IPSEC
 #endif
 #endif
 #include "ipsec.h"
 #ifdef IPSEC
 int
 ipsecsetup(int af, int fd, const char *policy)
+{
 	char *p0, *p;
 	int error;
-	if (!policy || *policy == '\0')
+	if (policy == NULL || *policy == '\0')
 		p0 = p = strdup("in entrust; out entrust");
 	else
 		p0 = p = strdup(policy);
 	error = 0;
 	for (;;) {
 		p = strtok(p, ";");
 		if (p == NULL)
 			break;
 		while (*p && isspace((unsigned char)*p))
 			p++;
-		if (!*p) {
+		if (*p == '\0') {
 			p = NULL;
 			continue;
+		}
-		error = ipsecsetup0(af, fd, p, 1);
+		error = ipsecsetup0(af, fd, p, true);
 		if (error < 0)
 			break;
 		p = NULL;
+	}
 	free(p0);
 	return error;
+}
 int
 ipsecsetup_test(const char *policy)
+{
 	char *p0, *p;
 	char *buf;
 	int error;
-	if (!policy)
+	if (policy == NULL)
 		return -1;
 	p0 = p = strdup(policy);
 	if (p == NULL)
 		return -1;
 	error = 0;
 	for (;;) {
 		p = strtok(p, ";");
 		if (p == NULL)
 			break;
 		while (*p && isspace((unsigned char)*p))
 			p++;
-		if (!*p) {
+		if (*p == '\0') {
 			p = NULL;
 			continue;
+		}
 		buf = ipsec_set_policy(p, (int)strlen(p));
 		if (buf == NULL) {
 			error = -1;
 			break;
+		}
 		free(buf);
 		p = NULL;
+	}
 	free(p0);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: parse_v2.c,v 1.4 2021/08/30 18:21:11 rillig Exp $	*/
+/*	$NetBSD: parse_v2.c,v 1.5 2021/09/03 20:24:28 rillig Exp $	*/
 /*-
  * Copyright (c) 2021 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by James Browning, Gabe Coffland, Alex Gavin, and Solomon Ritzow.
+ *
  * 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.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: parse_v2.c,v 1.4 2021/08/30 18:21:11 rillig Exp $");
+__RCSID("$NetBSD: parse_v2.c,v 1.5 2021/09/03 20:24:28 rillig Exp $");
 #include <ctype.h>
 #include <errno.h>
 #include <limits.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <syslog.h>
 #include <err.h>
 #include "inetd.h"
 #include "ipsec.h"
 @@ -382,27 +382,27 @@ strmove(char *buf, size_t off)
 /*
  * Perform an in-place parse of a single-line quoted string
  * with escape sequences. Sets *cpp to the position after the quoted characters.
  * Uses shell-style quote parsing.
  */
 static bool
 parse_quotes(char **cpp)
+{
 	char *cp = *cpp;
 	char quote = *cp;
 	strmove(cp, 1);
-	while (*cp && quote) {
+	while (*cp != '\0' && quote != '\0') {
 		if (*cp == quote) {
 			quote = '\0';
 			strmove(cp, 1);
 			continue;
+		}
 		if (*cp == '\\') {
 			/* start is location of backslash */
 			char *start = cp;
 			cp++;
 			switch (*cp) {
 			case 'x': {
 				int hi, lo;
 @@ -439,27 +439,27 @@ parse_quotes(char **cpp)
 				return false;
 			default:
 				ERR("Unknown escape sequence '\\%c'", *cp);
 				return false;
+			}
 			strmove(cp, 1);
 			continue;
+		}
 		/* Regular character, advance to the next one. */
 		cp++;
+	}
-	if (*cp == '\0' && quote) {
+	if (*cp == '\0' && quote != '\0') {
 		ERR("Unclosed quote");
 		return false;
+	}
 	*cpp = cp;
 	return true;
+}
 static int
 hex_to_bits(char in)
+{
 	switch(in) {
 	case '0'...'9':
 		return in - '0';
 @@ -777,27 +777,27 @@ protocol_handler(struct servtab *sep, vl
 /*
  * Convert a string number possible ending with k or m to an integer.
  * Based on MALFORMED, GETVAL, and ASSIGN in getconfigent(void).
  */
 static int
 size_to_bytes(char *arg)
+{
 	char *tail;
 	int rstatus, count;
 	count = (int)strtoi(arg, &tail, 10, 0, INT_MAX, &rstatus);
-	if (rstatus && rstatus != ENOTSUP) {
+	if (rstatus != 0 && rstatus != ENOTSUP) {
 		ERR("Invalid buffer size '%s': %s", arg, strerror(rstatus));
 		return -1;
+	}
 	switch(tail[0]) {
 	case 'm':
 		if (__builtin_smul_overflow((int)count, 1024, &count)) {
 			ERR("Invalid buffer size '%s': Result too large", arg);
 			return -1;
+		}
 		/* FALLTHROUGH */
 	case 'k':
 		if (__builtin_smul_overflow((int)count, 1024, &count)) {
 @@ -941,27 +941,27 @@ service_max_handler(struct servtab *sep,
 		return KEY_HANDLER_FAILURE;
+	}
 	count_str = next_value(values);
 	if (count_str == NULL) {
 		TFA("service_max");
 		return KEY_HANDLER_FAILURE;
+	}
 	size_t count = (size_t)strtou(count_str, NULL, 10, 0,
 	    SERVTAB_COUNT_MAX, &rstatus);
-	if (rstatus) {
+	if (rstatus != 0) {
 		ERR("Invalid service_max '%s': %s", count_str,
 		    strerror(rstatus));
 		return KEY_HANDLER_FAILURE;
+	}
 	if (next_value(values) != NULL) {
 		TMA("service_max");
 		return KEY_HANDLER_FAILURE;
+	}
 	sep->se_service_max = count;
 	return KEY_HANDLER_SUCCESS;
 @@ -978,27 +978,27 @@ ip_max_handler(struct servtab *sep, vlis
 		return KEY_HANDLER_FAILURE;
+	}
 	count_str = next_value(values);
 	if (count_str == NULL) {
 		TFA("ip_max");
 		return KEY_HANDLER_FAILURE;
+	}
 	size_t count = (size_t)strtou(count_str, NULL, 10, 0,
 	    SERVTAB_COUNT_MAX, &rstatus);
-	if (rstatus) {
+	if (rstatus != 0) {
 		ERR("Invalid ip_max '%s': %s", count_str, strerror(rstatus));
 		return KEY_HANDLER_FAILURE;
+	}
 	if (next_value(values) != NULL) {
 		TMA("ip_max");
 		return KEY_HANDLER_FAILURE;
+	}
 	sep->se_ip_max = count;
 	return KEY_HANDLER_SUCCESS;
+}
 @@ -1128,24 +1128,24 @@ ipsec_handler(struct servtab *sep, vlist
 	char *ipsecstr = next_value(values);
 	if (ipsecstr != NULL && ipsecsetup_test(ipsecstr) < 0) {
 		ERR("IPsec policy '%s' is invalid", ipsecstr);
 		return KEY_HANDLER_FAILURE;
+	}
 	/*
 	 * Use 'ipsec=' with no argument to disable ipsec for this service
 	 * An empty string indicates that IPsec was disabled, handled in
 	 * fill_default_values.
 	 */
-	sep->se_policy = policy ? newstr(ipsecstr) : newstr("");
+	sep->se_policy = policy != NULL ? newstr(ipsecstr) : newstr("");
 	if (next_value(values) != NULL) {
 		TMA("ipsec");
 		/* Currently only one semicolon separated string is allowed */
 		return KEY_HANDLER_FAILURE;
+	}
 	return KEY_HANDLER_SUCCESS;
+}
 #endif