Date: Sun, 19 Oct 2014 20:54:04 +0000 (UTC) From: Hiroki Sato <hrs@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r273286 - in stable/10: . etc/rc.d Message-ID: <201410192054.s9JKs4uD057644@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hrs Date: Sun Oct 19 20:54:04 2014 New Revision: 273286 URL: https://svnweb.freebsd.org/changeset/base/273286 Log: MFC r273285: - Honer MK_KERBEROS for Heimdal rc.d scripts. - Add rc.c/kerberos to OLD_FILES. Modified: stable/10/ObsoleteFiles.inc stable/10/etc/rc.d/Makefile Directory Properties: stable/10/ (props changed) Modified: stable/10/ObsoleteFiles.inc ============================================================================== --- stable/10/ObsoleteFiles.inc Sun Oct 19 20:46:59 2014 (r273285) +++ stable/10/ObsoleteFiles.inc Sun Oct 19 20:54:04 2014 (r273286) @@ -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 Modified: stable/10/etc/rc.d/Makefile ============================================================================== --- stable/10/etc/rc.d/Makefile Sun Oct 19 20:46:59 2014 (r273285) +++ stable/10/etc/rc.d/Makefile Sun Oct 19 20:54:04 2014 (r273286) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410192054.s9JKs4uD057644>