Author: ngie
Date: Wed Feb 11 09:00:22 2015
New Revision: 278570
URL: https://svnweb.freebsd.org/changeset/base/278570
Log:
MFC r277741:
r277741:
Respect MK_KERBEROS with etc/rc.d/ipropd_master and etc/rc.d/ipropd_slave
Sponsored by: EMC / Isilon Storage Division
Modified:
stable/10/etc/rc.d/Makefile
stable/10/tools/build/mk/OptionalObsoleteFiles.inc
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/etc/rc.d/Makefile
==============================================================================
--- stable/10/etc/rc.d/Makefile Wed Feb 11 08:52:29 2015 (r278569)
+++ stable/10/etc/rc.d/Makefile Wed Feb 11 09:00:22 2015 (r278570)
@@ -55,8 +55,6 @@ FILES= DAEMON \
ipfw \
ipmon \
ipnat \
- ipropd_master \
- ipropd_slave \
ipsec \
${_ipxrouted} \
${_kadmind} \
@@ -202,6 +200,8 @@ FILES+= jail
.endif
.if ${MK_KERBEROS} != "no"
+FILES+= ipropd_master
+FILES+= ipropd_slave
_kadmind= kadmind
_kdc= kdc
_kfd= kfd
Modified: stable/10/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- stable/10/tools/build/mk/OptionalObsoleteFiles.inc Wed Feb 11 08:52:29
2015 (r278569)
+++ stable/10/tools/build/mk/OptionalObsoleteFiles.inc Wed Feb 11 09:00:22
2015 (r278570)
@@ -2236,6 +2236,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
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "[email protected]"
