From owner-svn-src-all@FreeBSD.ORG  Sun Oct 19 20:54:05 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 4ECF0252;
 Sun, 19 Oct 2014 20:54:05 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 39224670;
 Sun, 19 Oct 2014 20:54:05 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9JKs5FE057646;
 Sun, 19 Oct 2014 20:54:05 GMT (envelope-from hrs@FreeBSD.org)
Received: (from hrs@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9JKs4uD057644;
 Sun, 19 Oct 2014 20:54:04 GMT (envelope-from hrs@FreeBSD.org)
Message-Id: <201410192054.s9JKs4uD057644@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: hrs set sender to hrs@FreeBSD.org
 using -f
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Sun, 19 Oct 2014 20:54:04 +0000 (UTC)
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
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 19 Oct 2014 20:54:05 -0000

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