From 98d13b7d481e69e9eca57102b8c114065512d434 Mon Sep 17 00:00:00 2001 From: Hiroki Sato Date: Sun, 19 Oct 2014 20:46:59 +0000 Subject: [PATCH] - Honer MK_KERBEROS for Heimdal rc.d scripts. - Add rc.c/kerberos to OLD_FILES. --- ObsoleteFiles.inc | 2 ++ etc/rc.d/Makefile | 15 +++++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index debdbc62c2d4..3629bb843543 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -48,6 +48,8 @@ OLD_FILES+=etc/rc.d/hv_kvpd # 20140917: libnv was accidentally being installed to /usr/lib instead of /lib OLD_LIBS+=usr/lib/libnv.a OLD_LIBS+=usr/lib/libnv.so.0 +# 20140829: rc.d/kerberos removed +OLD_FILES+=etc/rc.d/kerberos # 20140814: libopie version bump OLD_LIBS+=usr/lib/libopie.so.7 OLD_LIBS+=usr/lib32/libopie.so.7 diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile index 12c87db584cd..2a3057f68db9 100644 --- a/etc/rc.d/Makefile +++ b/etc/rc.d/Makefile @@ -70,12 +70,12 @@ FILES= DAEMON \ iscsictl \ iscsid \ jail \ - kadmind \ - kdc \ - kfd \ + ${_kadmind} \ + ${_kdc} \ + ${_kfd} \ kld \ kldxref \ - kpasswdd \ + ${_kpasswdd} \ ldconfig \ local \ localpkg \ @@ -181,6 +181,13 @@ _casperd= casperd _nscd= nscd .endif +.if ${MK_KERBEROS} != "no" +_kadmind= kadmind +_kdc= kdc +_kfd= kfd +_kpasswdd= kpasswdd +.endif + .if ${MK_OFED} != "no" _opensm= opensm .endif