From a0a63e617a33296fc1c77da63f1294fe2a9e99dd Mon Sep 17 00:00:00 2001
From: ngie <ngie@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Tue, 30 May 2017 17:46:19 +0000
Subject: [PATCH] MFC r317168:

Add a knob, WITH*_RPCBIND_WARMSTART_SUPPORT, to allow the end-user to build
rpcbind(8) with/without warmstart support.

The knob defaults to off to preserve POLA for the feature.

See rpcbind(8) for more details about the warmstart feature.

Relnotes:	yes


git-svn-id: svn://svn.freebsd.org/base/stable/10@319243 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 share/mk/bsd.own.mk                                | 1 +
 tools/build/options/WITH_RPCBIND_WARMSTART_SUPPORT | 4 ++++
 usr.sbin/rpcbind/Makefile                          | 4 ++++
 3 files changed, 9 insertions(+)
 create mode 100644 tools/build/options/WITH_RPCBIND_WARMSTART_SUPPORT

diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 0d21cb3b3..2a745a915 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -406,6 +406,7 @@ __DEFAULT_NO_OPTIONS = \
     NAND \
     OFED \
     PKGTOOLS \
+    RPCBIND_WARMSTART_SUPPORT \
     SHARED_TOOLCHAIN \
     SVN \
     TESTS \
diff --git a/tools/build/options/WITH_RPCBIND_WARMSTART_SUPPORT b/tools/build/options/WITH_RPCBIND_WARMSTART_SUPPORT
new file mode 100644
index 000000000..e1209e88f
--- /dev/null
+++ b/tools/build/options/WITH_RPCBIND_WARMSTART_SUPPORT
@@ -0,0 +1,4 @@
+.\" $FreeBSD$
+Set to build
+.Xr rpcbind 8
+with warmstart support.
diff --git a/usr.sbin/rpcbind/Makefile b/usr.sbin/rpcbind/Makefile
index 287aa407f..4dbcea13d 100644
--- a/usr.sbin/rpcbind/Makefile
+++ b/usr.sbin/rpcbind/Makefile
@@ -14,6 +14,10 @@ CFLAGS+= -DPORTMAP
 CFLAGS+= -DINET6
 .endif
 
+.if ${MK_RPCBIND_WARMSTART_SUPPORT} != "no"
+CFLAGS+= -DWARMSTART
+.endif
+
 .if ${MK_TCP_WRAPPERS} != "no"
 CFLAGS+= -DLIBWRAP
 DPADD+=	${LIBWRAP}
-- 
2.42.0