diff options
| -rw-r--r-- | libexec/rc/rc.d/Makefile | 11 | ||||
| -rw-r--r-- | share/mk/bsd.opts.mk | 1 | ||||
| -rw-r--r-- | share/mk/src.opts.mk | 1 | ||||
| -rw-r--r-- | tools/build/mk/OptionalObsoleteFiles.inc | 11 |
4 files changed, 8 insertions, 16 deletions
diff --git a/libexec/rc/rc.d/Makefile b/libexec/rc/rc.d/Makefile index 943d5171e8a1..77499e483f0d 100644 --- a/libexec/rc/rc.d/Makefile +++ b/libexec/rc/rc.d/Makefile @@ -242,17 +242,14 @@ CONFS+= lpd .if ${MK_KERBEROS} != "no" CONFS+= ipropd_master CONFS+= ipropd_slave - -DIRS+= VAR_HEMIDAL -VAR_HEMIDAL= /var/heimdal -VAR_HEMIDAL_MODE= 700 -.endif - -.if ${MK_KERBEROS_SCRIPTS} != "no" _kadmind= kadmind _kdc= kdc _kfd= kfd _kpasswdd= kpasswdd + +DIRS+= VAR_HEMIDAL +VAR_HEMIDAL= /var/heimdal +VAR_HEMIDAL_MODE= 700 .endif .if ${MK_MAIL} != "no" diff --git a/share/mk/bsd.opts.mk b/share/mk/bsd.opts.mk index ebed2e06e443..961508571b42 100644 --- a/share/mk/bsd.opts.mk +++ b/share/mk/bsd.opts.mk @@ -55,7 +55,6 @@ __DEFAULT_YES_OPTIONS = \ INCLUDES \ INSTALLLIB \ KERBEROS \ - KERBEROS_SCRIPTS \ MAKE_CHECK_USE_SANDBOX \ MAN \ MANCOMPRESS \ diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 3ac27f94d441..6726ea702fec 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -237,7 +237,6 @@ __DEFAULT_DEPENDENT_OPTIONS= \ INET \ INET6 \ KERBEROS \ - KERBEROS_SCRIPTS \ KVM \ NETGRAPH \ PAM \ diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index d8580f0f940f..11a5ce3648c5 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -3152,9 +3152,13 @@ OLD_FILES+=usr/libexec/hprop OLD_FILES+=usr/libexec/hpropd OLD_FILES+=usr/libexec/ipropd-master OLD_FILES+=usr/libexec/ipropd-slave +OLD_FILES+=usr/libexec/kadmind OLD_FILES+=usr/libexec/kcm +OLD_FILES+=usr/libexec/kdc OLD_FILES+=usr/libexec/kdigest +OLD_FILES+=usr/libexec/kfd OLD_FILES+=usr/libexec/kimpersonate +OLD_FILES+=usr/libexec/kpasswdd OLD_FILES+=usr/sbin/kstash OLD_FILES+=usr/sbin/ktutil OLD_FILES+=usr/sbin/iprop-log @@ -3876,13 +3880,6 @@ OLD_FILES+=usr/share/man/man8/string2key.8.gz OLD_FILES+=usr/share/man/man8/verify_krb5_conf.8.gz .endif -.if ${MK_KERBEROS_SCRIPTS} == no -OLD_FILES+=usr/libexec/kadmind -OLD_FILES+=usr/libexec/kdc -OLD_FILES+=usr/libexec/kfd -OLD_FILES+=usr/libexec/kpasswdd -.endif - .if ${MK_KERBEROS_SUPPORT} == no OLD_FILES+=usr/bin/compile_et OLD_FILES+=usr/include/com_err.h |