Due to popular demand, revert r360102.

Reported by:	many
This commit is contained in:
Cy Schubert 2020-04-19 21:38:03 +00:00
parent 944a64087e
commit 12de77b3db
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=360106
4 changed files with 8 additions and 16 deletions

View File

@ -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"

View File

@ -55,7 +55,6 @@ __DEFAULT_YES_OPTIONS = \
INCLUDES \
INSTALLLIB \
KERBEROS \
KERBEROS_SCRIPTS \
MAKE_CHECK_USE_SANDBOX \
MAN \
MANCOMPRESS \

View File

@ -237,7 +237,6 @@ __DEFAULT_DEPENDENT_OPTIONS= \
INET \
INET6 \
KERBEROS \
KERBEROS_SCRIPTS \
KVM \
NETGRAPH \
PAM \

View File

@ -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