diff options
| author | hrs <hrs@FreeBSD.org> | 2014-10-19 20:54:04 +0000 |
|---|---|---|
| committer | hrs <hrs@FreeBSD.org> | 2014-10-19 20:54:04 +0000 |
| commit | 525f95cd64eb5b3807691def3dd866b81a373563 (patch) | |
| tree | 145ff27dc15048969f74298c3af25f17136dccfd | |
| parent | 3da91303cf78e789faa8697b9fc4e57cbb23c284 (diff) | |
| download | FreeBSD-src-525f95cd64eb5b3807691def3dd866b81a373563.zip FreeBSD-src-525f95cd64eb5b3807691def3dd866b81a373563.tar.gz | |
MFC r273285:
- Honer MK_KERBEROS for Heimdal rc.d scripts.
- Add rc.c/kerberos to OLD_FILES.
| -rw-r--r-- | ObsoleteFiles.inc | 2 | ||||
| -rw-r--r-- | etc/rc.d/Makefile | 15 |
2 files changed, 13 insertions, 4 deletions
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index bd6547d..50d8b6b 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -40,6 +40,8 @@ # 20141015: OpenSSL 1.0.1j import OLD_FILES+=usr/share/openssl/man/man3/CMS_sign_add1_signer.3.gz +# 20141010: rc.d/kerberos removed +OLD_FILES+=etc/rc.d/kerberos # 20140917: hv_kvpd rc.d script removed in favor of devd configuration OLD_FILES+=etc/rc.d/hv_kvpd # 20140814: libopie version bump diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile index 9fc037d..1f3b3ab 100644 --- a/etc/rc.d/Makefile +++ b/etc/rc.d/Makefile @@ -71,13 +71,13 @@ FILES= DAEMON \ iscsictl \ iscsid \ jail \ - kadmind \ - kdc \ + ${_kadmind} \ + ${_kdc} \ keyserv \ - kfd \ + ${_kfd} \ kld \ kldxref \ - kpasswdd \ + ${_kpasswdd} \ ldconfig \ local \ localpkg \ @@ -173,6 +173,13 @@ FILES= DAEMON \ _ipxrouted= ipxrouted .endif +.if ${MK_KERBEROS} != "no" +_kadmind= kadmind +_kdc= kdc +_kfd= kfd +_kpasswdd= kpasswdd +.endif + .if ${MK_OFED} != "no" _opensm= opensm .endif |
