 @@ -1,30 +1,33 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/6/93
-#	$NetBSD: Makefile,v 1.30 2021/10/12 19:08:04 christos Exp $
+#	$NetBSD: Makefile,v 1.31 2022/08/10 03:35:38 dholland Exp $
 .include <bsd.own.mk>
 USE_FORT?= yes	# network server
 PROG=	inetd
 SRCS=	inetd.c parse.c parse_v2.c ratelimit.c
 MAN=	inetd.8
 MLINKS=	inetd.8 inetd.conf.5
 WARNS=	6
 #LINTFLAGS+=	-T
 # Enables debug printouts when in debug mode
 CPPFLAGS+=-DDEBUG_ENABLE
 # Enables SunRPC support
 CPPFLAGS+=-DRPC
 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
 CPPFLAGS+=-DIPSEC
 SRCS+=	ipsec.c
 LDADD+= -lipsec

 @@ -1,14 +1,14 @@
-/*	$NetBSD: inetd.c,v 1.139 2021/10/17 04:14:49 ryo Exp $	*/
+/*	$NetBSD: inetd.c,v 1.140 2022/08/10 03:35:38 dholland 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.139 2021/10/17 04:14:49 ryo Exp $");
+__RCSID("$NetBSD: inetd.c,v 1.140 2022/08/10 03:35:38 dholland 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
 @@ -183,31 +183,26 @@ __RCSID("$NetBSD: inetd.c,v 1.139 2021/1
  * 			initgroups(name, specified group)
+ *
  */
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/wait.h>
 #include <sys/resource.h>
 #include <sys/event.h>
 #include <sys/socket.h>
 #include <sys/queue.h>
 #ifndef NO_RPC
 #define RPC
 #endif
 #include <net/if.h>
 #ifdef RPC
 #include <rpc/rpc.h>
 #include <rpc/rpcb_clnt.h>
 #include <netconfig.h>
 #endif
 #include <ctype.h>
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <glob.h>

 @@ -1,14 +1,14 @@
-/*	$NetBSD: parse.c,v 1.3 2022/05/22 11:27:37 andvar Exp $	*/
+/*	$NetBSD: parse.c,v 1.4 2022/08/10 03:35:38 dholland 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
 @@ -54,53 +54,57 @@
  * 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>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)inetd.c	8.4 (Berkeley) 4/13/94";
 #else
-__RCSID("$NetBSD: parse.c,v 1.3 2022/05/22 11:27:37 andvar Exp $");
+__RCSID("$NetBSD: parse.c,v 1.4 2022/08/10 03:35:38 dholland Exp $");
 #endif
 #endif /* not lint */
 /*
  * This file contains code and state for loading and managing servtabs.
  * The "positional" syntax parsing is performed in this file. See parse_v2.c
  * for "key-values" syntax parsing.
  */
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/socket.h>
 #include <sys/queue.h>
 #include <ctype.h>
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <glob.h>
 #include <libgen.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <syslog.h>
 #include <unistd.h>
 #ifdef RPC
 #include <rpc/rpc.h>
 #endif
 #include "inetd.h"
 static void	config(void);
 static void	endconfig(void);
 static struct servtab	*enter(struct servtab *);
 static struct servtab	*getconfigent(char **);
 #ifdef DEBUG_ENABLE
 static void	print_service(const char *, struct servtab *);
 #endif
 static struct servtab	init_servtab(void);
 static void	include_configs(char *);
 static int	glob_error(const char *, int);
 static void	read_glob_configs(char *);
 @@ -311,27 +315,27 @@ config(void)
 						    SERV_FMT
 						    ": unknown service",
 						    SERV_PARAMS(sep));
 						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
+#endif /* RPC */
+			{
 				if (sep->se_fd >= 0)
 					close_sep(sep);
 				if (sep->se_fd == -1 && !ISMUX(sep))
 					setup(sep);
+			}
+		    }
+		}
+	}
 	endconfig();
+}
 static struct servtab *