 @@ -1,14 +1,14 @@
-/* 	$NetBSD: get_net.c,v 1.2 2015/12/24 01:41:19 christos Exp $	 */
+/* 	$NetBSD: get_net.c,v 1.3 2020/04/23 00:22:01 joerg Exp $	 */
 /*
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Herb Hasler and Rick Macklem at The University of Guelph.
+ *
  * 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.
 @@ -23,46 +23,46 @@
  * 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 REGENTS 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: get_net.c,v 1.2 2015/12/24 01:41:19 christos Exp $");
+__RCSID("$NetBSD: get_net.c,v 1.3 2020/04/23 00:22:01 joerg Exp $");
 #include <sys/types.h>
 #include <netdb.h>
 #include <stdio.h>
 #include <limits.h>
 #include <errno.h>
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <util.h>
 #include <arpa/inet.h>
 #include <netinet/in.h>
 #include "mountd.h"
 #ifdef TEST
 int      opt_flags;
 const int ninumeric = NI_NUMERICHOST;
-int      debug = 1;
+int      mountd_debug = 1;
 #endif
 static int
 isdottedquad(const char *cp)
+{
 	for (;;)
 		switch (*cp++) {
 		case '\0':
 			return 1;
 		case '.':
 		case '0': case '1': case '2': case '3': case '4':
 		case '5': case '6': case '7': case '8': case '9':
 			continue;
 @@ -135,27 +135,27 @@ get_net(char *cp, struct netmsk *net, in
 		sin.sin_family = AF_INET;
 		sin.sin_len = sizeof sin;
 		sin.sin_addr = inet_makeaddr(np->n_net, 0);
 		sa = (struct sockaddr *)&sin;
 	} else if (isdottedquad(cp)) {
 		/*
 		 * Handle dotted quad [or less than quad] notation specially
 		 * because getaddrinfo() will parse them in the old style:
 		 * i.e. 1.2.3 -> 1.2.0.3 not 1.2.3.0
 		 */
 		sin.sin_family = AF_INET;
 		sin.sin_len = sizeof sin;
 		sin.sin_addr = inet_makeaddr(inet_network(cp), 0);
-		if (debug)
+		if (mountd_debug)
 			fprintf(stderr, "get_net: '%s' v4 addr %x\n",
 			    cp, sin.sin_addr.s_addr);
 		sa = (struct sockaddr *)&sin;
 	} else {
 		memset(&hints, 0, sizeof hints);
 		hints.ai_family = AF_UNSPEC;
 		hints.ai_flags = AI_NUMERICHOST;
 		if (getaddrinfo(cp, NULL, &hints, &ai) == 0)
 			sa = ai->ai_addr;
 		else
 			goto fail;
+	}

 @@ -1,14 +1,14 @@
-/* 	$NetBSD: mountd.c,v 1.130 2018/01/09 03:31:13 christos Exp $	 */
+/* 	$NetBSD: mountd.c,v 1.131 2020/04/23 00:22:01 joerg Exp $	 */
 /*
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Herb Hasler and Rick Macklem at The University of Guelph.
+ *
  * 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.
 @@ -32,27 +32,27 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1989, 1993\
  The Regents of the University of California.  All rights reserved.");
 #endif				/* not lint */
 #ifndef lint
 #if 0
 static char     sccsid[] = "@(#)mountd.c  8.15 (Berkeley) 5/1/95";
 #else
-__RCSID("$NetBSD: mountd.c,v 1.130 2018/01/09 03:31:13 christos Exp $");
+__RCSID("$NetBSD: mountd.c,v 1.131 2020/04/23 00:22:01 joerg Exp $");
 #endif
 #endif				/* not lint */
 #include <sys/param.h>
 #include <sys/file.h>
 #include <sys/ioctl.h>
 #include <sys/mount.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <syslog.h>
 #include <sys/ucred.h>
 #include <rpc/rpc.h>
 @@ -228,27 +228,27 @@ static struct grouplist *grphead;
 static const char *exname;
 static struct uucred def_anon = {
 ,
 	(uid_t) -2,
 	(gid_t) -2,
 ,
 	{ 0 }
 };
 int      opt_flags;
 static int	have_v6 = 1;
 const int ninumeric = NI_NUMERICHOST;
-int      debug = DEBUGGING;
+int      mountd_debug = DEBUGGING;
 #if 0
 static void SYSLOG(int, const char *,...);
 #endif
 /*
  * If this is non-zero, -noresvport and -noresvmnt are implied for
  * each export.
  */
 static int noprivports;
 #ifdef MOUNTD_RUMP
 #define C2FD(_c_) ((int)(uintptr_t)(_c_))
 static int
 @@ -359,27 +359,27 @@ main(int argc, char **argv)
 	while ((c = getopt(argc, argv, "dNnrp:" ADDOPTS)) != -1)
 		switch (c) {
 #ifdef IPSEC
 		case 'P':
 			if (ipsecsetup_test(policy = optarg))
 				errx(1, "Invalid ipsec policy `%s'", policy);
 			break;
 #endif
 		case 'p':
 			/* A forced port "0" will dynamically allocate a port */
 			forcedport = atoi(optarg);
 			break;
 		case 'd':
-			debug = 1;
+			mountd_debug = 1;
 			break;
 		case 'N':
 			noprivports = 1;
 			break;
 			/* Compatibility */
 		case 'n':
 		case 'r':
 			break;
 		default:
 			fprintf(stderr, "Usage: %s [-dN]"
 #ifdef IPSEC
 			    " [-P policy]"
 #endif
 @@ -404,36 +404,36 @@ main(int argc, char **argv)
 	pthread_t ptdummy;
 	svc_fdset_init(SVC_FDSET_MT);
 	sem_init(&exportsem, 0, 0);
 	pthread_create(&ptdummy, NULL, exportlist_thread, NULL);
 	exname = _PATH_EXPORTS;
 	have_v6 = 0;
 	(void)signal(SIGHUP, signal_get_exportlist);
 #endif
 	grphead = NULL;
 	exphead = NULL;
 	mlhead = NULL;
-	openlog("mountd", LOG_PID | (debug ? LOG_PERROR : 0), LOG_DAEMON);
+	openlog("mountd", LOG_PID | (mountd_debug ? LOG_PERROR : 0), LOG_DAEMON);
 	(void)signal(SIGSYS, no_nfs);
-	if (debug)
+	if (mountd_debug)
 		(void)fprintf(stderr, "Getting export list.\n");
 	get_exportlist(0);
-	if (debug)
+	if (mountd_debug)
 		(void)fprintf(stderr, "Getting mount list.\n");
 	get_mountlist();
-	if (debug)
+	if (mountd_debug)
 		(void)fprintf(stderr, "Here we go.\n");
 	(void)signal(SIGTERM, send_umntall);
 	rpcb_unset(RPCPROG_MNT, RPCMNT_VER1, NULL);
 	rpcb_unset(RPCPROG_MNT, RPCMNT_VER3, NULL);
 	udpsock  = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
 	tcpsock  = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
 	udp6sock = socket(AF_INET6, SOCK_DGRAM, IPPROTO_UDP);
 	tcp6sock = socket(AF_INET6, SOCK_STREAM, IPPROTO_TCP);
 	/*
 	 * We're doing host-based access checks here, so don't allow
 @@ -537,27 +537,27 @@ main(int argc, char **argv)
 				syslog(LOG_WARNING, "can't register TCP6 service");
 			else
 				xcreated++;
 		} else
 			syslog(LOG_WARNING, "can't create TCP6 service");
+	}
 	if (xcreated == 0) {
 		syslog(LOG_ERR, "could not create any services");
 		exit(1);
+	}
-	if (debug == 0) {
+	if (mountd_debug == 0) {
 		daemon(0, 0);
 		(void)signal(SIGINT, SIG_IGN);
 		(void)signal(SIGQUIT, SIG_IGN);
+	}
 	pidfile(NULL);
 #ifdef MOUNTD_RUMP
 	sem_post(&gensem);
 #endif
 	svc_run();
 	syslog(LOG_ERR, "Mountd died");
 	exit(1);
+}
 @@ -602,60 +602,60 @@ mntsrv(struct svc_req *rqstp, SVCXPRT *t
+	}
 	lookup_failed = getnameinfo(saddr, saddr->sa_len, host, sizeof host,
 	    NULL, 0, 0);
 	if (getnameinfo(saddr, saddr->sa_len, numerichost,
 	    sizeof numerichost, NULL, 0, ninumeric) != 0)
 		strlcpy(numerichost, "?", sizeof(numerichost));
 	ret = 0;
 	switch (rqstp->rq_proc) {
 	case NULLPROC:
 		if (!svc_sendreply(transp, (xdrproc_t)xdr_void, NULL))
 			syslog(LOG_ERR, "Can't send reply");
 		return;
 	case MOUNTPROC_MNT:
-		if (debug)
+		if (mountd_debug)
 			fprintf(stderr,
 			    "got mount request from %s\n", numerichost);
 		if (!svc_getargs(transp, xdr_dir, rpcpath)) {
-			if (debug)
+			if (mountd_debug)
 				fprintf(stderr, "-> garbage args\n");
 			svcerr_decode(transp);
 			return;
+		}
-		if (debug)
+		if (mountd_debug)
 			fprintf(stderr,
 			    "-> rpcpath: %s\n", rpcpath);
 		/*
 		 * Get the real pathname and make sure it is a file or
 		 * directory that exists.
 		 */
 		if (
 #ifndef MOUNTD_RUMP
 		realpath(rpcpath, rdirpath) == NULL ||
 #else
 		strcpy(rdirpath, rpcpath) == NULL ||
 #endif
 		    stat(rdirpath, &stb) < 0 ||
 		    (!S_ISDIR(stb.st_mode) && !S_ISREG(stb.st_mode)) ||
 		    statvfs1(rdirpath, &fsb, ST_WAIT) < 0) {
 			(void)chdir("/"); /* Just in case realpath doesn't */
-			if (debug)
+			if (mountd_debug)
 				(void)fprintf(stderr, "-> stat failed on %s\n",
 				    rdirpath);
 			if (!svc_sendreply(transp, (xdrproc_t)xdr_long, (caddr_t) &bad))
 				syslog(LOG_ERR, "Can't send reply");
 			return;
+		}
-		if (debug)
+		if (mountd_debug)
 			fprintf(stderr,
 			    "-> dirpath: %s\n", rdirpath);
 		/* Check in the exports list */
 		(void)sigprocmask(SIG_BLOCK, &sighup_mask, NULL);
 		ep = ex_search(&fsb.f_fsidx);
 		hostset = defset = 0;
 		if (ep && (chk_host(ep->ex_defdir, saddr, &defset,
 		   &hostset) || ((dp = dirp_search(ep->ex_dirl, rdirpath)) &&
 		   chk_host(dp, saddr, &defset, &hostset)) ||
 		   (defset && scan_tree(ep->ex_defdir, saddr) == 0 &&
 		   scan_tree(ep->ex_dirl, saddr) == 0))) {
 			if ((hostset & DP_HOSTSET) == 0) {
 				hostset = defset;
 @@ -686,27 +686,27 @@ mntsrv(struct svc_req *rqstp, SVCXPRT *t
 				bad = EINVAL; /* XXX */
 				if (!svc_sendreply(transp, (xdrproc_t)xdr_long,
 				    (char *)&bad))
 					syslog(LOG_ERR, "Can't send reply");
 				goto out;
+			}
 			fhr.fhr_fhsize = fh_size;
 			if (!svc_sendreply(transp, (xdrproc_t)xdr_fhs, (char *) &fhr))
 				syslog(LOG_ERR, "Can't send reply");
 			if (!lookup_failed)
 				add_mlist(host, rdirpath, hostset);
 			else
 				add_mlist(numerichost, rdirpath, hostset);
-			if (debug)
+			if (mountd_debug)
 				(void)fprintf(stderr, "Mount successful.\n");
 		} else {
 			if (!svc_sendreply(transp, (xdrproc_t)xdr_long, (caddr_t) &bad))
 				syslog(LOG_ERR, "Can't send reply");
+		}
 out:
 		(void)sigprocmask(SIG_UNBLOCK, &sighup_mask, NULL);
 		return;
 	case MOUNTPROC_DUMP:
 		if (!svc_sendreply(transp, (xdrproc_t)xdr_mlist, NULL))
 			syslog(LOG_ERR, "Can't send reply");
 		return;
 	case MOUNTPROC_UMNT:
 @@ -982,32 +982,32 @@ parse_directory(const char *line, size_t
 			    line, (unsigned long)lineno);
 			return 0;
+		}
 	} else {
 		/*
 		 * See if this directory is already
 		 * in the list.
 		 */
 		*ep = ex_search(&fsp->f_fsidx);
 		if (*ep == NULL) {
 			*ep = get_exp();
 			(*ep)->ex_fs = fsp->f_fsidx;
 			(*ep)->ex_fsdir = estrdup(fsp->f_mntonname);
-			if (debug)
+			if (mountd_debug)
 				(void)fprintf(stderr,
 				    "Making new ep fs=0x%x,0x%x\n",
 				    fsp->f_fsidx.__fsid_val[0], fsp->f_fsidx.__fsid_val[1]);
 		} else {
-			if (debug)
+			if (mountd_debug)
 				(void)fprintf(stderr,
 				    "Found ep fs=0x%x,0x%x\n",
 				    fsp->f_fsidx.__fsid_val[0], fsp->f_fsidx.__fsid_val[1]);
+		}
+	}
 	return 1;
+}
 /*
  * Get the export list
  */
 @@ -1068,34 +1068,34 @@ get_exportlist(int n)
 		fsp++;
+	}
 	/*
 	 * Read in the exports file and build the list, calling
 	 * mount() as we go along to push the export rules into the kernel.
 	 */
 	if ((exp_file = fopen(exname, "r")) == NULL) {
 		/*
 		 * Don't exit here; we can still reload the config
 		 * after a SIGHUP.
 		 */
-		if (debug)
+		if (mountd_debug)
 			(void)fprintf(stderr, "Can't open %s: %s\n", exname,
 			    strerror(errno));
 		return;
+	}
 	dirhead = NULL;
 	while ((line = fparseln(exp_file, &len, &lineno, NULL, 0)) != NULL) {
-		if (debug)
+		if (mountd_debug)
 			(void)fprintf(stderr, "Got line %s\n", line);
 		cp = line;
 		nextfield(&cp, &endcp);
 		if (cp == endcp)
 			goto nextline;	/* skip empty line */
 		/*
 		 * Set defaults.
 		 */
 		has_host = FALSE;
 		anon = def_anon;
 		exflags = MNT_EXPORTED;
 		got_nondir = 0;
 		opt_flags = 0;
 @@ -1120,27 +1120,27 @@ get_exportlist(int n)
 				goto badline;
+			}
 			switch (*cp) {
 			case '-':
 				/*
 				 * Option
 				 */
 				if (ep == NULL) {
 					syslog(LOG_ERR,
 				"\"%s\", line %ld: No current export list",
 					    line, (unsigned long)lineno);
 					goto badline;
+				}
-				if (debug)
+				if (mountd_debug)
 					(void)fprintf(stderr, "doing opt %s\n",
 					    cp);
 				got_nondir = 1;
 				if (do_opt(line, lineno, &cp, &endcp, ep, grp,
 				    &has_host, &exflags, &anon))
 					goto badline;
 				break;
 			case '/':
 				/*
 				 * Directory
 				 */
 				savedc = *endcp;
 @@ -1174,27 +1174,27 @@ get_exportlist(int n)
 				*endcp = savedc;
 				break;
+			}
 			cp = endcp;
 			nextfield(&cp, &endcp);
 			len = endcp - cp;
+		}
 		if (check_options(line, lineno, dirhead))
 			goto badline;
 		if (!has_host) {
 			grp->gr_type = GT_HOST;
-			if (debug)
+			if (mountd_debug)
 				(void)fprintf(stderr,
 				    "Adding a default entry\n");
 			/* add a default group and make the grp list NULL */
 			ai = emalloc(sizeof(struct addrinfo));
 			ai->ai_flags = 0;
 			ai->ai_family = AF_INET;	/* XXXX */
 			ai->ai_socktype = SOCK_DGRAM;
 			/* setting the length to 0 will match anything */
 			ai->ai_addrlen = 0;
 			ai->ai_flags = AI_CANONNAME;
 			ai->ai_canonname = estrdup("Default");
 			ai->ai_addr = NULL;
 			ai->ai_next = NULL;
 @@ -1472,27 +1472,27 @@ dirp_search(struct dirlist *dp, char *di
  * order (big endian).
  */
 static int
 bitcmp(void *dst, void *src, int bitlen)
+{
 	int i;
 	u_int8_t *p1 = dst, *p2 = src;
 	u_int8_t bitmask;
 	int bytelen, bitsleft;
 	bytelen = bitlen / 8;
 	bitsleft = bitlen % 8;
-	if (debug) {
+	if (mountd_debug) {
 		printf("comparing:\n");
 		for (i = 0; i < (bitsleft ? bytelen + 1 : bytelen); i++)
 			printf("%02x", p1[i]);
 		printf("\n");
 		for (i = 0; i < (bitsleft ? bytelen + 1 : bytelen); i++)
 			printf("%02x", p2[i]);
 		printf("\n");
+	}
 	for (i = 0; i < bytelen; i++) {
 		if (*p1 != *p2)
 			return 1;
 		p1++;
 @@ -1745,27 +1745,27 @@ do_opt(const char *line, size_t lineno,
 		} else if (cpoptarg && (!strcmp(cpopt, "mask") ||
 		    !strcmp(cpopt, "m"))) {
 			if (get_net(cpoptarg, &grp->gr_ptr.gt_net, 1)) {
 				syslog(LOG_ERR,
 				    "\"%s\", line %ld: Bad mask: %s",
 				    line, (unsigned long)lineno, cpoptarg);
 				return (1);
+			}
 			usedarg++;
 			opt_flags |= OP_MASK;
 		} else if (cpoptarg && (!strcmp(cpopt, "network") ||
 		    !strcmp(cpopt, "n"))) {
 			if (strchr(cpoptarg, '/') != NULL) {
-				if (debug)
+				if (mountd_debug)
 					fprintf(stderr, "setting OP_MASKLEN\n");
 				opt_flags |= OP_MASKLEN;
+			}
 			if (grp->gr_type != GT_NULL) {
 				syslog(LOG_ERR,
 				    "\"%s\", line %ld: Network/host conflict",
 				    line, (unsigned long)lineno);
 				return (1);
 			} else if (get_net(cpoptarg, &grp->gr_ptr.gt_net, 0)) {
 				syslog(LOG_ERR,
 				    "\"%s\", line %ld: Bad net: %s",
 				    line, (unsigned long)lineno, cpoptarg);
 				return (1);
 @@ -1840,27 +1840,27 @@ get_host(const char *line, size_t lineno
 		return 1;
+	}
 	grp->gr_type = GT_HOST;
 	grp->gr_ptr.gt_addrinfo = ai;
 	while (ai != NULL) {
 		if (ai->ai_canonname == NULL) {
 			if (getnameinfo(ai->ai_addr, ai->ai_addrlen, host,
 			    sizeof host, NULL, 0, ninumeric) != 0)
 				strlcpy(host, "?", sizeof(host));
 			ai->ai_canonname = estrdup(host);
 			ai->ai_flags |= AI_CANONNAME;
 		} else
 			ai->ai_flags &= ~AI_CANONNAME;
-		if (debug)
+		if (mountd_debug)
 			(void)fprintf(stderr, "got host %s\n", ai->ai_canonname);
 		ai = ai->ai_next;
+	}
 	return (0);
+}
 /*
  * Free up an exports list component
  */
 static void
 free_exp(struct exportlist *ep)
+{
 @@ -2268,27 +2268,27 @@ free_grp(struct grouplist *grp)
 			free(grp->gr_ptr.gt_net.nt_name);
+	}
 	free(grp);
+}
 #if 0
 static void
 SYSLOG(int pri, const char *fmt,...)
+{
 	va_list ap;
 	va_start(ap, fmt);
-	if (debug)
+	if (mountd_debug)
 		vfprintf(stderr, fmt, ap);
 	else
 		vsyslog(pri, fmt, ap);
 	va_end(ap);
+}
 #endif
 /*
  * Check options for consistency.
  */
 static int
 check_options(const char *line, size_t lineno, struct dirlist *dp)

 @@ -1,14 +1,14 @@
-/* 	$NetBSD: mountd.h,v 1.3 2015/12/29 04:30:43 pgoyette Exp $ */
+/* 	$NetBSD: mountd.h,v 1.4 2020/04/23 00:22:01 joerg Exp $ */
 /*
  * Copyright (c) 1989, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Herb Hasler and Rick Macklem at The University of Guelph.
+ *
  * 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.
 @@ -33,23 +33,23 @@
  */
 #define	OP_MAPROOT	0x001
 #define	OP_MAPALL	0x002
 #define	OP_KERB		0x004
 #define	OP_MASK		0x008
 #define	OP_NET		0x010
 #define	OP_ALLDIRS	0x040
 #define	OP_NORESPORT	0x080
 #define	OP_NORESMNT	0x100
 #define	OP_MASKLEN	0x200
 extern int opt_flags;
-extern int debug;
+extern int mountd_debug;
 extern const int ninumeric;
 struct netmsk {
 	struct sockaddr_storage nt_net;
 	int		nt_len;
 	char           *nt_name;
 };
 int get_net(char *, struct netmsk *, int);