Attachment #116044 for bug #174246

Lines 131-136 Link Here

(-)rpcbind-0.1.4/man/rpcbind.8.orig (+8 lines)
131	clients from using	131	clients from using
132	.Nm	132	.Nm
133	to connect to services from a privileged port.	133	to connect to services from a privileged port.
		134	.It Fl w
		135	Cause
		136	.Nm
		137	to do a "warm start" by read a state file when
		138	.Nm
		139	starts up. The state file is created when
		140	.Nm
		141	terminates.
134	.El	142	.El
135	.Sh NOTES	143	.Sh NOTES
136	All RPC servers must be restarted if	144	All RPC servers must be restarted if




#include <syslog.h>
#include <unistd.h>

#include "config.h"
#include "rpcbind.h"

/*
 * XXX this code is unsafe and is not used. It should be made safe.
 */

#ifndef RPCBIND_STATEDIR
#define RPCBIND_STATEDIR "/tmp"
#endif

/* These files keep the pmap_list and rpcb_list in XDR format */
#define	RPCBFILE	RPCBIND_STATEDIR "/rpcbind.file"
#ifdef PORTMAP
#define	PMAPFILE	RPCBIND_STATEDIR "/portmap.file"
#endif

static bool_t write_struct __P((char *, xdrproc_t, void *));

Added Link Here

(-) (+2 lines)
1	/* this define where the state files live for warm starts */
2	#undef RPCBIND_STATEDIR




INCLUDES = -I$(srcdir)/tirpc -DPORTMAP -DINET6 -DVERSION="\"$(VERSION)\"" \
                                                -D_GNU_SOURCE -Wall -pipe
if DEBUG
INCLUDES +=	-DRPCBIND_DEBUG -DSVC_RUN_DEBUG -DDEBUG_RMTCALL
INCLUDES +=	-DND_DEBUG -DBIND_DEBUG
endif

if WARMSTART
INCLUDES +=	-DWARMSTART
endif


bin_PROGRAMS = rpcbind rpcinfo


rpcbind_LDADD = $(LIB_TIRPC)
AM_CPPFLAGS = -I/usr/include/tirpc -DCHECK_LOCAL -DPORTMAP \
                       -DFACILITY=LOG_MAIL -DSEVERITY=LOG_INFO
if DEBUG
INCLUDES +=	-DRPCBIND_DEBUG -DSVC_RUN_DEBUG -DDEBUG_RMTCALL
INCLUDES +=	-DND_DEBUG -DBIND_DEBUG
endif

$(rpcbind_OBJECTS) :    security.o util.o check_bound.o pmap_svc.o \
                        rpcb_svc.o rpcb_svc_com.o rpcb_svc_4.o \

Lines 9-15 Link Here

(-)rpcbind-0.1.4/configure.in.orig (-1 / +21 lines)
9	##AC_PROG_RANLIB	9	##AC_PROG_RANLIB
10	AC_HEADER_DIRENT	10	AC_HEADER_DIRENT
11	AC_PREFIX_DEFAULT(/usr)	11	AC_PREFIX_DEFAULT(/usr)
12		12
		13	AC_CONFIG_SRCDIR([src/config.h.in])
		14	AC_CONFIG_HEADERS([src/config.h])
		15
13	AC_ARG_ENABLE(debug,[ --enable-debug Turns on rpcbind debugging],	16	AC_ARG_ENABLE(debug,[ --enable-debug Turns on rpcbind debugging],
14	[case "${enableval}" in	17	[case "${enableval}" in
15	yes) debug=true ;;	18	yes) debug=true ;;
Lines 18-23 Link Here
18	esac],[debug=false])	21	esac],[debug=false])
19	AM_CONDITIONAL(DEBUG, test x$debug = xtrue)	22	AM_CONDITIONAL(DEBUG, test x$debug = xtrue)
20		23
		24	AC_ARG_ENABLE(warmstarts,[ --enable-warmstarts Enables Warm Starts],
		25	[case "${enableval}" in
		26	yes) warmstarts=true ;;
		27	no) warmstarts=no ;;
		28	*) AC_MSG_ERROR(bad value ${enableval} for --enable-warmstarts) ;;
		29	esac],[warmstarts=false])
		30	AM_CONDITIONAL(WARMSTART, test x$warmstarts = xtrue)
		31
		32	if test "$warmstarts" = "true" ; then
		33	AC_ARG_WITH(statedir,
		34	[ --with-statedir=/foo use state dir /foo [/tmp]],
		35	statedir=$withval,
		36	statedir=/tmp)
		37	AC_SUBST(statedir)
		38	AC_DEFINE_UNQUOTED(RPCBIND_STATEDIR, "$statedir", [This defines the location where the state files will be kept for warm starts])
		39	fi
		40
21	AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h \	41	AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h \
22	netinet/in.h stdlib.h string.h \	42	netinet/in.h stdlib.h string.h \
23	sys/param.h sys/socket.h \	43	sys/param.h sys/socket.h \

Return to bug 174246

Lines 46-62 Link Here

(-)rpcbind-0.1.4/src/warmstart.c.orig (-2 / +6 lines)
46	#include <syslog.h>	46	#include <syslog.h>
47	#include <unistd.h>	47	#include <unistd.h>
48		48
		49	#include "config.h"
49	#include "rpcbind.h"	50	#include "rpcbind.h"
50		51
51	/*	52	/*
52	* XXX this code is unsafe and is not used. It should be made safe.	53	* XXX this code is unsafe and is not used. It should be made safe.
53	*/	54	*/
54		55
		56	#ifndef RPCBIND_STATEDIR
		57	#define RPCBIND_STATEDIR "/tmp"
		58	#endif
55		59
56	/* These files keep the pmap_list and rpcb_list in XDR format */	60	/* These files keep the pmap_list and rpcb_list in XDR format */
57	#define RPCBFILE "/tmp/rpcbind.file"	61	#define RPCBFILE RPCBIND_STATEDIR "/rpcbind.file"
58	#ifdef PORTMAP	62	#ifdef PORTMAP
59	#define PMAPFILE "/tmp/portmap.file"	63	#define PMAPFILE RPCBIND_STATEDIR "/portmap.file"
60	#endif	64	#endif
61		65
62	static bool_t write_struct __P((char , xdrproc_t, void ));	66	static bool_t write_struct __P((char , xdrproc_t, void ));

Lines 1-5 Link Here

(-)rpcbind-0.1.4/src/Makefile.am.orig (-4 / +9 lines)
1	INCLUDES = -I$(srcdir)/tirpc -DPORTMAP -DINET6 -DVERSION="\"$(VERSION)\"" \	1	INCLUDES = -I$(srcdir)/tirpc -DPORTMAP -DINET6 -DVERSION="\"$(VERSION)\"" \
2	-D_GNU_SOURCE -Wall -pipe	2	-D_GNU_SOURCE -Wall -pipe
		3	if DEBUG
		4	INCLUDES += -DRPCBIND_DEBUG -DSVC_RUN_DEBUG -DDEBUG_RMTCALL
		5	INCLUDES += -DND_DEBUG -DBIND_DEBUG
		6	endif
		7
		8	if WARMSTART
		9	INCLUDES += -DWARMSTART
		10	endif
		11
3		12
4	bin_PROGRAMS = rpcbind rpcinfo	13	bin_PROGRAMS = rpcbind rpcinfo
5		14
Lines 18-27 Link Here
18	rpcbind_LDADD = $(LIB_TIRPC)	27	rpcbind_LDADD = $(LIB_TIRPC)
19	AM_CPPFLAGS = -I/usr/include/tirpc -DCHECK_LOCAL -DPORTMAP \	28	AM_CPPFLAGS = -I/usr/include/tirpc -DCHECK_LOCAL -DPORTMAP \
20	-DFACILITY=LOG_MAIL -DSEVERITY=LOG_INFO	29	-DFACILITY=LOG_MAIL -DSEVERITY=LOG_INFO
21	if DEBUG
22	INCLUDES += -DRPCBIND_DEBUG -DSVC_RUN_DEBUG -DDEBUG_RMTCALL
23	INCLUDES += -DND_DEBUG -DBIND_DEBUG
24	endif
25		30
26	$(rpcbind_OBJECTS) : security.o util.o check_bound.o pmap_svc.o \	31	$(rpcbind_OBJECTS) : security.o util.o check_bound.o pmap_svc.o \
27	rpcb_svc.o rpcb_svc_com.o rpcb_svc_4.o \	32	rpcb_svc.o rpcb_svc_com.o rpcb_svc_4.o \