d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Conditionally install Kerberos rc files based on MK_KERBEROS_SCRIPTS

Browse Source 
instead of MK_KERBEROS. The reason for this change is some users
prefer to build FreeBSD WITHOUT_KERBEROS, wanting to retain the
Kerberos rc scripts to start/stop MIT Kerberos or Heimdal from ports.

PR:		197337
Reported by:	Adam McDougall <ebay at looksharp.net>
Reviewed by:	imp
Differential Revision:	https://reviews.freebsd.org/D24252
This commit is contained in:
Cy Schubert 2020-04-19 17:01:21 +00:00
parent 0de1739f53
commit 4574585e8f
4 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libexec/rc/rc.d/Makefile
View File

@ -242,16 +242,19 @@ CONFS+= lpd
.if ${MK_KERBEROS} != "no" .if ${MK_KERBEROS} != "no"
CONFS+= ipropd_master CONFS+= ipropd_master
CONFS+= ipropd_slave CONFS+= ipropd_slave
_kadmind= kadmind
_kdc= kdc
_kfd= kfd
_kpasswdd= kpasswdd
DIRS+= VAR_HEMIDAL DIRS+= VAR_HEMIDAL
VAR_HEMIDAL= /var/heimdal VAR_HEMIDAL= /var/heimdal
VAR_HEMIDAL_MODE= 700 VAR_HEMIDAL_MODE= 700
.endif .endif
.if ${MK_KERBEROS_SCRIPTS} != "no"
_kadmind= kadmind
_kdc= kdc
_kfd= kfd
_kpasswdd= kpasswdd
.endif
.if ${MK_MAIL} != "no" .if ${MK_MAIL} != "no"
CONFS+= othermta CONFS+= othermta
.endif .endif

1
share/mk/bsd.opts.mk
View File

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

1
share/mk/src.opts.mk
View File

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

11
tools/build/mk/OptionalObsoleteFiles.inc
View File

@ -3152,13 +3152,9 @@ OLD_FILES+=usr/libexec/hprop
OLD_FILES+=usr/libexec/hpropd OLD_FILES+=usr/libexec/hpropd
OLD_FILES+=usr/libexec/ipropd-master OLD_FILES+=usr/libexec/ipropd-master
OLD_FILES+=usr/libexec/ipropd-slave OLD_FILES+=usr/libexec/ipropd-slave
OLD_FILES+=usr/libexec/kadmind
OLD_FILES+=usr/libexec/kcm OLD_FILES+=usr/libexec/kcm
OLD_FILES+=usr/libexec/kdc
OLD_FILES+=usr/libexec/kdigest OLD_FILES+=usr/libexec/kdigest
OLD_FILES+=usr/libexec/kfd
OLD_FILES+=usr/libexec/kimpersonate OLD_FILES+=usr/libexec/kimpersonate
OLD_FILES+=usr/libexec/kpasswdd
OLD_FILES+=usr/sbin/kstash OLD_FILES+=usr/sbin/kstash
OLD_FILES+=usr/sbin/ktutil OLD_FILES+=usr/sbin/ktutil
OLD_FILES+=usr/sbin/iprop-log OLD_FILES+=usr/sbin/iprop-log
@ -3880,6 +3876,13 @@ OLD_FILES+=usr/share/man/man8/string2key.8.gz
OLD_FILES+=usr/share/man/man8/verify_krb5_conf.8.gz OLD_FILES+=usr/share/man/man8/verify_krb5_conf.8.gz
.endif .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 .if ${MK_KERBEROS_SUPPORT} == no
OLD_FILES+=usr/bin/compile_et OLD_FILES+=usr/bin/compile_et
OLD_FILES+=usr/include/com_err.h OLD_FILES+=usr/include/com_err.h