[src/netbsd-9]: src/usr.sbin Pull up following revision(s) (requested by kami...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/70c717fca252
branches:  netbsd-9
changeset: 1000690:70c717fca252
user:      martin <martin%NetBSD.org@localhost>
date:      Fri Aug 16 19:25:31 2019 +0000

description:
Pull up following revision(s) (requested by kamil in ticket #70):

        usr.sbin/rpc.statd/statd.c: revision 1.33
        usr.sbin/rpc.lockd/lockd.c: revision 1.13
        usr.sbin/rpc.bootparamd/bootparamd.c: revision 1.47

Stop defining _rpcsvcdirty in bss and data

_rpcsvcdirty is already defined in the generated code from rpcgen(1).

Detected during the build with Address Sanitizer (MKSANITIZER).

diffstat:

 usr.sbin/rpc.bootparamd/bootparamd.c |  6 +++---
 usr.sbin/rpc.lockd/lockd.c           |  6 +++---
 usr.sbin/rpc.statd/statd.c           |  6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diffs (81 lines):

diff -r d9b117cd3219 -r 70c717fca252 usr.sbin/rpc.bootparamd/bootparamd.c
--- a/usr.sbin/rpc.bootparamd/bootparamd.c      Fri Aug 16 19:23:52 2019 +0000
+++ b/usr.sbin/rpc.bootparamd/bootparamd.c      Fri Aug 16 19:25:31 2019 +0000
@@ -1,4 +1,4 @@
-/*     $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.
@@ -11,7 +11,7 @@
 
 #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>
@@ -55,7 +55,7 @@
 
 extern void bootparamprog_1(struct svc_req *, SVCXPRT *);
 
-int    _rpcsvcdirty = 0;
+extern int     _rpcsvcdirty;
 int    _rpcpmstart = 0;
 int     debug = 0;
 int     dolog = 0;
diff -r d9b117cd3219 -r 70c717fca252 usr.sbin/rpc.lockd/lockd.c
--- a/usr.sbin/rpc.lockd/lockd.c        Fri Aug 16 19:23:52 2019 +0000
+++ b/usr.sbin/rpc.lockd/lockd.c        Fri Aug 16 19:25:31 2019 +0000
@@ -1,4 +1,4 @@
-/*     $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
@@ -35,7 +35,7 @@
 
 #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
 
 /*
@@ -67,7 +67,7 @@
 #include <rpcsvc/nlm_prot.h>
 
 int            debug_level = 0;        /* 0 = no debugging syslog() calls */
-int            _rpcsvcdirty = 0;
+extern int     _rpcsvcdirty;
 
 int grace_expired;
 
diff -r d9b117cd3219 -r 70c717fca252 usr.sbin/rpc.statd/statd.c
--- a/usr.sbin/rpc.statd/statd.c        Fri Aug 16 19:23:52 2019 +0000
+++ b/usr.sbin/rpc.statd/statd.c        Fri Aug 16 19:25:31 2019 +0000
@@ -1,4 +1,4 @@
-/*     $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
@@ -36,7 +36,7 @@
 
 #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        */
@@ -66,7 +66,7 @@
 
 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;