 @@ -1,27 +1,27 @@
-/*	$NetBSD: bootparamd.c,v 1.46 2011/08/30 20:29:41 joerg Exp $	*/
+/*	$NetBSD: bootparamd.c,v 1.46.44.1 2019/08/16 19:25:31 martin Exp $	*/
 /*
  * This code is not copyright, and is placed in the public domain.
  * Feel free to use and modify. Please send modifications and/or
  * suggestions + bug fixes to Klas Heggemann <klas@nada.kth.se>
+ *
  * Various small changes by Theo de Raadt <deraadt@fsa.ca>
  * Parser rewritten (adding YP support) by Roland McGrath <roland@frob.com>
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: bootparamd.c,v 1.46 2011/08/30 20:29:41 joerg Exp $");
+__RCSID("$NetBSD: bootparamd.c,v 1.46.44.1 2019/08/16 19:25:31 martin Exp $");
 #endif
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <sys/socket.h>
 #include <assert.h>
 #include <ctype.h>
 #include <errno.h>
 #include <err.h>
 #include <fnmatch.h>
 #include <netdb.h>
 @@ -45,27 +45,27 @@ __RCSID("$NetBSD: bootparamd.c,v 1.46 20
 #include <rpcsvc/ypclnt.h>
 #endif
 #include "pathnames.h"
 #define MAXLEN 800
 static char hostname[MAX_MACHINE_NAME];
 static char askname[MAX_MACHINE_NAME];
 static char domain_name[MAX_MACHINE_NAME];
 extern void bootparamprog_1(struct svc_req *, SVCXPRT *);
-int	_rpcsvcdirty = 0;
+extern int	_rpcsvcdirty;
 int	_rpcpmstart = 0;
 int     debug = 0;
 int     dolog = 0;
 struct in_addr route_addr;
 struct sockaddr_in my_addr;
 const char *bootpfile = _PATH_BOOTPARAMS;
 char   *iface = NULL;
 static int	lookup_bootparam(char *, char *, char *, char **, char **);
 __dead static void	usage(void);
 static int get_localaddr(const char *, struct sockaddr_in *);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: lockd.c,v 1.12 2012/08/13 12:37:18 wiz Exp $	*/
+/*	$NetBSD: lockd.c,v 1.12.34.1 2019/08/16 19:25:31 martin Exp $	*/
 /*
  * Copyright (c) 1995
  *	A.R. Gordon (andrew.gordon@net-tel.co.uk).  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.
 @@ -25,27 +25,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR 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>
 #ifndef lint
-__RCSID("$NetBSD: lockd.c,v 1.12 2012/08/13 12:37:18 wiz Exp $");
+__RCSID("$NetBSD: lockd.c,v 1.12.34.1 2019/08/16 19:25:31 martin Exp $");
 #endif
 /*
  * main() function for NFS lock daemon.  Most of the code in this
  * file was generated by running rpcgen /usr/include/rpcsvc/nlm_prot.x.
+ *
  * The actual program logic is in the file lock_proc.c
  */
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <err.h>
 @@ -57,27 +57,27 @@ __RCSID("$NetBSD: lockd.c,v 1.12 2012/08
 #include <signal.h>
 #include <string.h>
 #include <unistd.h>
 #include <util.h>
 #include <netconfig.h>
 #include <rpc/rpc.h>
 #include <rpcsvc/sm_inter.h>
 #include "lockd.h"
 #include <rpcsvc/nlm_prot.h>
 int		debug_level = 0;	/* 0 = no debugging syslog() calls */
-int		_rpcsvcdirty = 0;
+extern int	_rpcsvcdirty;
 int grace_expired;
 void	nlm_prog_0(struct svc_req *, SVCXPRT *);
 void	nlm_prog_1(struct svc_req *, SVCXPRT *);
 void	nlm_prog_3(struct svc_req *, SVCXPRT *);
 void	nlm_prog_4(struct svc_req *, SVCXPRT *);
 static void	usage(void) __dead;
 static void sigalarm_handler(int);
 static const char *transports[] = { "udp", "tcp", "udp6", "tcp6" };

 @@ -1,14 +1,14 @@
-/*	$NetBSD: statd.c,v 1.32 2018/01/23 21:06:26 sevan Exp $	*/
+/*	$NetBSD: statd.c,v 1.32.6.1 2019/08/16 19:25:31 martin Exp $	*/
 /*
  * Copyright (c) 1995
  *	A.R. Gordon (andrew.gordon@net-tel.co.uk).  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,27 +26,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR 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>
 #ifndef lint
-__RCSID("$NetBSD: statd.c,v 1.32 2018/01/23 21:06:26 sevan Exp $");
+__RCSID("$NetBSD: statd.c,v 1.32.6.1 2019/08/16 19:25:31 martin Exp $");
 #endif
 /* main() function for status monitor daemon.  Some of the code in this	*/
 /* file was generated by running rpcgen /usr/include/rpcsvc/sm_inter.x	*/
 /* The actual program logic is in the file procs.c			*/
 #include <sys/param.h>
 #include <sys/wait.h>
 #include <err.h>
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
 @@ -56,27 +56,27 @@ __RCSID("$NetBSD: statd.c,v 1.32 2018/01
 #include <string.h>
 #include <syslog.h>
 #include <unistd.h>
 #include <util.h>
 #include <db.h>
 #include <netconfig.h>
 #include <rpc/rpc.h>
 #include "statd.h"
 struct sigaction sa;
 int     	debug = 0;		/* Controls syslog() for debug msgs */
-int     	_rpcsvcdirty = 0;	/* XXX ??? */
+extern int     	_rpcsvcdirty;
 static DB	*db;			/* Database file */
 Header		 status_info;
 static char undefdata[] = "\0\1\2\3\4\5\6\7";
 static DBT undefkey = {
 	undefdata,
 	sizeof(undefdata)
 };
 /* statd.c */
 static int walk_one(int (*fun )(DBT *, HostInfo *, void *), DBT *, DBT *, void *);