From owner-svn-src-head@FreeBSD.ORG  Sun May  6 20:46:05 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 756CD106564A;
	Sun,  6 May 2012 20:46:05 +0000 (UTC)
	(envelope-from stas@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5FBA28FC12;
	Sun,  6 May 2012 20:46:05 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q46Kk5Sg031157;
	Sun, 6 May 2012 20:46:05 GMT (envelope-from stas@svn.freebsd.org)
Received: (from stas@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q46Kk5Ae031154;
	Sun, 6 May 2012 20:46:05 GMT (envelope-from stas@svn.freebsd.org)
Message-Id: <201205062046.q46Kk5Ae031154@svn.freebsd.org>
From: Stanislav Sedov <stas@FreeBSD.org>
Date: Sun, 6 May 2012 20:46:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r235107 - in head/etc: defaults rc.d
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 06 May 2012 20:46:05 -0000

Author: stas
Date: Sun May  6 20:46:04 2012
New Revision: 235107
URL: http://svn.freebsd.org/changeset/base/235107

Log:
  - Change kfd rc script to be more conformant with rcNG conventions:
    o change rcname to kfd;
    o move mandatory options to command_args;
    o add missing "shutdown" keyword;
    o fix require line.  Kfd doesn't really need to be started before
      daemons.
  
  Suggested by:	dougb

Modified:
  head/etc/defaults/rc.conf
  head/etc/rc.d/kfd

Modified: head/etc/defaults/rc.conf
==============================================================================
--- head/etc/defaults/rc.conf	Sun May  6 20:40:18 2012	(r235106)
+++ head/etc/defaults/rc.conf	Sun May  6 20:46:04 2012	(r235107)
@@ -297,8 +297,8 @@ kadmind5_server_enable="NO"	# Run kadmin
 kadmind5_server="/usr/libexec/kadmind"	# path to kerberos 5 admin daemon
 kpasswdd_server_enable="NO"	# Run kpasswdd (or NO)
 kpasswdd_server="/usr/libexec/kpasswdd"	# path to kerberos 5 passwd daemon
-kfd_server_enable="NO"		# Run kfd (or NO)
-kfd_server="/usr/libexec/kfd"	# path to kerberos 5 kfd daemon
+kfd_enable="NO"			# Run kfd (or NO)
+kfd_program="/usr/libexec/kfd"	# path to kerberos 5 kfd daemon
 
 gssd_enable="NO"		# Run the gssd daemon (or NO).
 gssd_flags=""			# Flags for gssd.

Modified: head/etc/rc.d/kfd
==============================================================================
--- head/etc/rc.d/kfd	Sun May  6 20:40:18 2012	(r235106)
+++ head/etc/rc.d/kfd	Sun May  6 20:46:04 2012	(r235107)
@@ -4,16 +4,14 @@
 #
 
 # PROVIDE: kfd
-# BEFORE: DAEMON
+# REQUIRE: NETWORK
+# KEYWORD: shutdown
 
 . /etc/rc.subr
 
-name="kfd"
+name=kfd
+rcvar=kfd_enable
 load_rc_config $name
-rcvar="kfd_server_enable"
-unset start_cmd
-command="${kfd_server}"
-kfd_flags="-i"
-command_args="&"
+command_args="-i &"
 
 run_rc_command "$1"