From 7fdb2b7a8df2933bd6b5c1c8bf189721afe03eac Mon Sep 17 00:00:00 2001
From: Enji Cooper <ngie@FreeBSD.org>
Date: Mon, 26 Jan 2015 09:51:21 +0000
Subject: [PATCH] Respect MK_KERBEROS with etc/rc.d/ipropd_master and
 etc/rc.d/ipropd_slave

MFC after: 2 weeks
Sponsored by: EMC / Isilon Storage Division
---
 etc/rc.d/Makefile                        | 4 ++--
 tools/build/mk/OptionalObsoleteFiles.inc | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile
index 804966e3bea..a19f73ae9d2 100644
--- a/etc/rc.d/Makefile
+++ b/etc/rc.d/Makefile
@@ -54,8 +54,6 @@ FILES=	DAEMON \
 	ipfw \
 	ipmon \
 	ipnat \
-	ipropd_master \
-	ipropd_slave \
 	ipsec \
 	${_kadmind} \
 	${_kdc} \
@@ -213,6 +211,8 @@ _nscd=		nscd
 .endif
 
 .if ${MK_KERBEROS} != "no"
+FILES+=		ipropd_master
+FILES+=		ipropd_slave
 _kadmind=	kadmind
 _kdc=		kdc
 _kfd=		kfd
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 5bc8149f73e..2e40b7e6d26 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -2379,6 +2379,8 @@ OLD_FILES+=usr/share/man/man8/jls.8.gz
 .endif
 
 .if ${MK_KERBEROS} == no
+OLD_FILES+=etc/rc.d/ipropd_master
+OLD_FILES+=etc/rc.d/ipropd_slave
 OLD_FILES+=usr/bin/compile_et
 OLD_FILES+=usr/bin/hxtool
 OLD_FILES+=usr/bin/kadmin