Attachment #213516 for bug #197337




.if ${MK_KERBEROS} != "no"
CONFS+=		ipropd_master
CONFS+=		ipropd_slave
_kadmind=	kadmind
_kdc=		kdc
_kfd=		kfd
_kpasswdd=	kpasswdd

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
.endif

.if ${MK_MAIL} != "no"
CONFS+=		othermta
.endif

Lines 55-60 __DEFAULT_YES_OPTIONS = \ Link Here

(-)b/share/mk/bsd.opts.mk (+1 lines)
55	INCLUDES \	55	INCLUDES \
56	INSTALLLIB \	56	INSTALLLIB \
57	KERBEROS \	57	KERBEROS \
		58	KERBEROS_SCRIPTS \
58	MAKE_CHECK_USE_SANDBOX \	59	MAKE_CHECK_USE_SANDBOX \
59	MAN \	60	MAN \
60	MANCOMPRESS \	61	MANCOMPRESS \

Lines 237-242 __DEFAULT_DEPENDENT_OPTIONS= \ Link Here

(-)b/share/mk/src.opts.mk (+1 lines)
237	INET \	237	INET \
238	INET6 \	238	INET6 \
239	KERBEROS \	239	KERBEROS \
		240	KERBEROS_SCRIPTS \
240	KVM \	241	KVM \
241	NETGRAPH \	242	NETGRAPH \
242	PAM \	243	PAM \




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

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

Return to bug 197337

Lines 3152-3164 OLD_FILES+=usr/libexec/hprop Link Here

(-)b/tools/build/mk/OptionalObsoleteFiles.inc (-4 / +7 lines)
3152	OLD_FILES+=usr/libexec/hpropd	3152	OLD_FILES+=usr/libexec/hpropd
3153	OLD_FILES+=usr/libexec/ipropd-master	3153	OLD_FILES+=usr/libexec/ipropd-master
3154	OLD_FILES+=usr/libexec/ipropd-slave	3154	OLD_FILES+=usr/libexec/ipropd-slave
3155	OLD_FILES+=usr/libexec/kadmind
3156	OLD_FILES+=usr/libexec/kcm	3155	OLD_FILES+=usr/libexec/kcm
3157	OLD_FILES+=usr/libexec/kdc
3158	OLD_FILES+=usr/libexec/kdigest	3156	OLD_FILES+=usr/libexec/kdigest
3159	OLD_FILES+=usr/libexec/kfd
3160	OLD_FILES+=usr/libexec/kimpersonate	3157	OLD_FILES+=usr/libexec/kimpersonate
3161	OLD_FILES+=usr/libexec/kpasswdd
3162	OLD_FILES+=usr/sbin/kstash	3158	OLD_FILES+=usr/sbin/kstash
3163	OLD_FILES+=usr/sbin/ktutil	3159	OLD_FILES+=usr/sbin/ktutil
3164	OLD_FILES+=usr/sbin/iprop-log	3160	OLD_FILES+=usr/sbin/iprop-log
Lines 3880-3885 OLD_FILES+=usr/share/man/man8/string2key.8.gz Link Here
3880	OLD_FILES+=usr/share/man/man8/verify_krb5_conf.8.gz	3876	OLD_FILES+=usr/share/man/man8/verify_krb5_conf.8.gz
3881	.endif	3877	.endif
3882		3878
		3879	.if ${MK_KERBEROS_SCRIPTS} == no
		3880	OLD_FILES+=usr/libexec/kadmind
		3881	OLD_FILES+=usr/libexec/kdc
		3882	OLD_FILES+=usr/libexec/kfd
		3883	OLD_FILES+=usr/libexec/kpasswdd
		3884	.endif
		3885
3883	.if ${MK_KERBEROS_SUPPORT} == no	3886	.if ${MK_KERBEROS_SUPPORT} == no
3884	OLD_FILES+=usr/bin/compile_et	3887	OLD_FILES+=usr/bin/compile_et
3885	OLD_FILES+=usr/include/com_err.h	3888	OLD_FILES+=usr/include/com_err.h

Lines 242-257 CONFS+= lpd Link Here

(-)b/libexec/rc/rc.d/Makefile (-4 / +7 lines)
242	.if ${MK_KERBEROS} != "no"	242	.if ${MK_KERBEROS} != "no"
243	CONFS+= ipropd_master	243	CONFS+= ipropd_master
244	CONFS+= ipropd_slave	244	CONFS+= ipropd_slave
245	_kadmind= kadmind
246	_kdc= kdc
247	_kfd= kfd
248	_kpasswdd= kpasswdd
249		245
250	DIRS+= VAR_HEMIDAL	246	DIRS+= VAR_HEMIDAL
251	VAR_HEMIDAL= /var/heimdal	247	VAR_HEMIDAL= /var/heimdal
252	VAR_HEMIDAL_MODE= 700	248	VAR_HEMIDAL_MODE= 700
253	.endif	249	.endif
254		250
		251	.if ${MK_KERBEROS_SCRIPTS} != "no"
		252	_kadmind= kadmind
		253	_kdc= kdc
		254	_kfd= kfd
		255	_kpasswdd= kpasswdd
		256	.endif
		257
255	.if ${MK_MAIL} != "no"	258	.if ${MK_MAIL} != "no"
256	CONFS+= othermta	259	CONFS+= othermta
257	.endif	260	.endif