Attachment 213516 Details for Bug 197337 – Final version to be committed

[patch] Final version to be committed

pr197337.diff (text/plain), 2.25 KB, created by Cy Schubert on 2020-04-18 03:12:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Cy Schubert

Created: 2020-04-18 03:12:38 UTC

Size: 2.25 KB

patch

obsolete

>diff --git a/libexec/rc/rc.d/Makefile b/libexec/rc/rc.d/Makefile
>index 77499e483f0..943d5171e8a 100644
>--- a/libexec/rc/rc.d/Makefile
>+++ b/libexec/rc/rc.d/Makefile
>@@ -242,16 +242,19 @@ CONFS+=		lpd
> .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
>diff --git a/share/mk/bsd.opts.mk b/share/mk/bsd.opts.mk
>index 961508571b4..ebed2e06e44 100644
>--- a/share/mk/bsd.opts.mk
>+++ b/share/mk/bsd.opts.mk
>@@ -55,6 +55,7 @@ __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 6726ea702fe..3ac27f94d44 100644
>--- a/share/mk/src.opts.mk
>+++ b/share/mk/src.opts.mk
>@@ -237,6 +237,7 @@ __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 11a5ce3648c..d8580f0f940 100644
>--- a/tools/build/mk/OptionalObsoleteFiles.inc
>+++ b/tools/build/mk/OptionalObsoleteFiles.inc
>@@ -3152,13 +3152,9 @@ 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
>@@ -3880,6 +3876,13 @@ 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

Actions: View | Diff

Attachments on bug 197337: 212814 | 212815 | 213516 | 242534