From owner-svn-src-user@FreeBSD.ORG  Tue Nov  4 12:03:56 2008
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0F0C71065688;
	Tue,  4 Nov 2008 12:03:56 +0000 (UTC) (envelope-from dfr@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id F19DA8FC16;
	Tue,  4 Nov 2008 12:03:55 +0000 (UTC) (envelope-from dfr@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mA4C3t85096097;
	Tue, 4 Nov 2008 12:03:55 GMT (envelope-from dfr@svn.freebsd.org)
Received: (from dfr@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mA4C3tOg096094;
	Tue, 4 Nov 2008 12:03:55 GMT (envelope-from dfr@svn.freebsd.org)
Message-Id: <200811041203.mA4C3tOg096094@svn.freebsd.org>
From: Doug Rabson <dfr@FreeBSD.org>
Date: Tue, 4 Nov 2008 12:03:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r184628 - user/dfr/gssapi/7/etc/rc.d
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 04 Nov 2008 12:03:56 -0000

Author: dfr
Date: Tue Nov  4 12:03:55 2008
New Revision: 184628
URL: http://svn.freebsd.org/changeset/base/184628

Log:
  Merged /head/etc/rc.d:r184588

Added:
  user/dfr/gssapi/7/etc/rc.d/gssd
     - copied unchanged from r184588, head/etc/rc.d/gssd
Modified:
  user/dfr/gssapi/7/etc/rc.d/   (props changed)
  user/dfr/gssapi/7/etc/rc.d/Makefile
  user/dfr/gssapi/7/etc/rc.d/nfsd

Modified: user/dfr/gssapi/7/etc/rc.d/Makefile
==============================================================================
--- user/dfr/gssapi/7/etc/rc.d/Makefile	Tue Nov  4 12:02:01 2008	(r184627)
+++ user/dfr/gssapi/7/etc/rc.d/Makefile	Tue Nov  4 12:03:55 2008	(r184628)
@@ -11,7 +11,7 @@ FILES=	DAEMON FILESYSTEMS LOGIN NETWORKI
 	dmesg dumpon \
 	early.sh encswap \
 	fsck ftp-proxy ftpd \
-	gbde geli geli2 \
+	gbde geli geli2 gssd \
 	hcsecd \
 	hostapd hostid hostname \
 	idmapd inetd initrandom \

Copied: user/dfr/gssapi/7/etc/rc.d/gssd (from r184588, head/etc/rc.d/gssd)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/dfr/gssapi/7/etc/rc.d/gssd	Tue Nov  4 12:03:55 2008	(r184628, copy of r184588, head/etc/rc.d/gssd)
@@ -0,0 +1,18 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: gssd
+# REQUIRE: root
+# KEYWORD: nojail shutdown
+
+. /etc/rc.subr
+
+name="gssd"
+
+load_rc_config $name
+rcvar="gssd_enable"
+command="${gssd:-/usr/sbin/${name}}"
+eval ${name}_flags=\"${gssd_flags}\"
+run_rc_command "$1"

Modified: user/dfr/gssapi/7/etc/rc.d/nfsd
==============================================================================
--- user/dfr/gssapi/7/etc/rc.d/nfsd	Tue Nov  4 12:02:01 2008	(r184627)
+++ user/dfr/gssapi/7/etc/rc.d/nfsd	Tue Nov  4 12:03:55 2008	(r184628)
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: nfsd
-# REQUIRE: mountd
+# REQUIRE: mountd hostname gssd
 # KEYWORD: nojail
 
 . /etc/rc.subr