Module Name: src
Committed By: martin
Date: Fri Aug 16 19:25:32 UTC 2019
Modified Files:
src/usr.sbin/rpc.bootparamd [netbsd-9]: bootparamd.c
src/usr.sbin/rpc.lockd [netbsd-9]: lockd.c
src/usr.sbin/rpc.statd [netbsd-9]: statd.c
Log Message:
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).
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.46.44.1 src/usr.sbin/rpc.bootparamd/bootparamd.c
cvs rdiff -u -r1.12 -r1.12.34.1 src/usr.sbin/rpc.lockd/lockd.c
cvs rdiff -u -r1.32 -r1.32.6.1 src/usr.sbin/rpc.statd/statd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/rpc.bootparamd/bootparamd.c
diff -u src/usr.sbin/rpc.bootparamd/bootparamd.c:1.46 src/usr.sbin/rpc.bootparamd/bootparamd.c:1.46.44.1
--- src/usr.sbin/rpc.bootparamd/bootparamd.c:1.46 Tue Aug 30 20:29:41 2011
+++ src/usr.sbin/rpc.bootparamd/bootparamd.c Fri Aug 16 19:25:31 2019
@@ -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 @@ 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;
Index: src/usr.sbin/rpc.lockd/lockd.c
diff -u src/usr.sbin/rpc.lockd/lockd.c:1.12 src/usr.sbin/rpc.lockd/lockd.c:1.12.34.1
--- src/usr.sbin/rpc.lockd/lockd.c:1.12 Mon Aug 13 12:37:18 2012
+++ src/usr.sbin/rpc.lockd/lockd.c Fri Aug 16 19:25:31 2019
@@ -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 @@ __RCSID("$NetBSD: lockd.c,v 1.12 2012/08
#include <rpcsvc/nlm_prot.h>
int debug_level = 0; /* 0 = no debugging syslog() calls */
-int _rpcsvcdirty = 0;
+extern int _rpcsvcdirty;
int grace_expired;
Index: src/usr.sbin/rpc.statd/statd.c
diff -u src/usr.sbin/rpc.statd/statd.c:1.32 src/usr.sbin/rpc.statd/statd.c:1.32.6.1
--- src/usr.sbin/rpc.statd/statd.c:1.32 Tue Jan 23 21:06:26 2018
+++ src/usr.sbin/rpc.statd/statd.c Fri Aug 16 19:25:31 2019
@@ -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 @@ __RCSID("$NetBSD: statd.c,v 1.32 2018/01
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;
