The branch main has been updated by ivy:
URL:
https://cgit.FreeBSD.org/src/commit/?id=992d2f928452519877c7d4377d8e5ae124d68dba
commit 992d2f928452519877c7d4377d8e5ae124d68dba
Author: Lexi Winter <i...@freebsd.org>
AuthorDate: 2025-08-10 12:26:44 +0000
Commit: Lexi Winter <i...@freebsd.org>
CommitDate: 2025-08-10 15:36:39 +0000
rc.d: Fix Kerberos rc scripts
Split the Kerberos rc scripts into two sections, one for MIT Kerberos
and one for Heimdal. Don't install Heimdal-specific rc scripts (e.g.,
kfd) for the MIT case.
This does not include an OptionalObsoleteFiles change (even though one
is needed) because that will be fixed later in a different way.
Reviewed by: des (previous version)
Differential Revision: https://reviews.freebsd.org/D51830
---
libexec/rc/rc.d/Makefile | 37 ++++++++++++++++++++++++-------------
1 file changed, 24 insertions(+), 13 deletions(-)
diff --git a/libexec/rc/rc.d/Makefile b/libexec/rc/rc.d/Makefile
index 62285018cbef..d0c6fc1dee46 100644
--- a/libexec/rc/rc.d/Makefile
+++ b/libexec/rc/rc.d/Makefile
@@ -29,12 +29,8 @@ CONFS= DAEMON \
iovctl \
ip6addrctl \
ipsec \
- ${_kadmind} \
- ${_kdc} \
- ${_kfd} \
kld \
kldxref \
- ${_kpasswdd} \
ldconfig \
linux \
local \
@@ -288,17 +284,32 @@ LPPACKAGE= lp
.endif
.if ${MK_KERBEROS} != "no"
-CONFS+= ipropd_master
-CONFS+= ipropd_slave
-_kadmind= kadmind
-_kdc= kdc
-_kfd= kfd
-_kpasswdd= kpasswdd
-
-DIRS+= VAR_HEMIDAL
+.if ${MK_MITKRB5} == "no"
+
+# Heimdal rc scripts
+CONFGROUPS+= HEIMDAL
+HEIMDAL= ipropd_master \
+ ipropd_slave \
+ kadmind \
+ kdc \
+ kfd \
+ kpasswdd
+HEIMDALPACKAGE= kerberos
+
+DIRS+= VAR_HEMIDAL
VAR_HEMIDAL= /var/heimdal
VAR_HEMIDAL_MODE= 700
-.endif
+
+.else # ${MK_MITKRB5} != "no"
+
+# MIT KRB5 rc scripts
+CONFGROUPS+= KRB5
+KRB5= kadmind \
+ kdc
+KRB5PACKAGE= kerberos-kdc
+
+.endif # ${MK_MITKRB5}
+.endif # ${MK_KERBEROS}
.if ${MK_NIS} != "no"
CONFGROUPS+= YP
