Module Name: src
Committed By: ginsbach
Date: Wed Aug 16 23:38:16 UTC 2017
Modified Files:
src/usr.sbin/rpcbind: Makefile warmstart.c
Log Message:
Write the "warm start" file to /var/run rather than /tmp.
(Restore changes clobbered by merge of FreeBSD changes. Hi christos!)
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/rpcbind/Makefile
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/rpcbind/warmstart.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/rpcbind/Makefile
diff -u src/usr.sbin/rpcbind/Makefile:1.12 src/usr.sbin/rpcbind/Makefile:1.13
--- src/usr.sbin/rpcbind/Makefile:1.12 Wed Apr 22 15:23:07 2009
+++ src/usr.sbin/rpcbind/Makefile Wed Aug 16 23:38:16 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2009/04/22 15:23:07 lukem Exp $
+# $NetBSD: Makefile,v 1.13 2017/08/16 23:38:16 ginsbach Exp $
.include <bsd.own.mk>
@@ -21,6 +21,7 @@ CPPFLAGS+= -DINET6
# Uncomment these to get any useful output from 'rpcbind -d'
# CPPFLAGS+= -DRPCBIND_DEBUG
# CPPFLAGS+= -DSVC_RUN_DEBUG
+CPPFLAGS+= -DWARMSTART
LDADD+= -lwrap -lutil
DPADD+= ${LIBWRAP} ${LIBUTIL}
Index: src/usr.sbin/rpcbind/warmstart.c
diff -u src/usr.sbin/rpcbind/warmstart.c:1.6 src/usr.sbin/rpcbind/warmstart.c:1.7
--- src/usr.sbin/rpcbind/warmstart.c:1.6 Wed Aug 16 08:44:40 2017
+++ src/usr.sbin/rpcbind/warmstart.c Wed Aug 16 23:38:16 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: warmstart.c,v 1.6 2017/08/16 08:44:40 christos Exp $ */
+/* $NetBSD: warmstart.c,v 1.7 2017/08/16 23:38:16 ginsbach Exp $ */
/* $FreeBSD: head/usr.sbin/rpcbind/warmstart.c 258564 2013-11-25 16:44:02Z hrs $*/
/*-
@@ -42,6 +42,7 @@
#include <stdio.h>
#include <fcntl.h>
#include <err.h>
+#include <paths.h>
#include <rpc/rpc.h>
#include <rpc/rpcb_prot.h>
#include <rpc/xdr.h>
@@ -61,9 +62,9 @@
/* These files keep the pmap_list and rpcb_list in XDR format */
-#define RPCBFILE "/tmp/rpcbind.file"
+#define RPCBFILE _PATH_VARRUN "rpcbind.file"
#ifdef PORTMAP
-#define PMAPFILE "/tmp/portmap.file"
+#define PMAPFILE _PATH_VARRUN "portmap.file"
#endif
static bool_t write_struct(const char *, xdrproc_t, void *);
