From owner-svn-src-all@FreeBSD.ORG  Fri Aug 29 06:23:02 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 10AC071B;
 Fri, 29 Aug 2014 06:23:02 +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 F041C1AA6;
 Fri, 29 Aug 2014 06:23:01 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7T6N1uo052551;
 Fri, 29 Aug 2014 06:23:01 GMT (envelope-from hrs@FreeBSD.org)
Received: (from hrs@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7T6N1eP052540;
 Fri, 29 Aug 2014 06:23:01 GMT (envelope-from hrs@FreeBSD.org)
Message-Id: <201408290623.s7T6N1eP052540@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: Fri, 29 Aug 2014 06:23:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270780 - in head/etc: defaults rc.d
X-SVN-Group: head
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: Fri, 29 Aug 2014 06:23:02 -0000

Author: hrs
Date: Fri Aug 29 06:23:00 2014
New Revision: 270780
URL: http://svnweb.freebsd.org/changeset/base/270780

Log:
  Fix rc.d/gssd script to define the default values in a standard way.

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

Modified: head/etc/defaults/rc.conf
==============================================================================
--- head/etc/defaults/rc.conf	Fri Aug 29 02:21:02 2014	(r270779)
+++ head/etc/defaults/rc.conf	Fri Aug 29 06:23:00 2014	(r270780)
@@ -282,6 +282,7 @@ 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_program="/usr/sbin/gssd"	# Path to gssd.
 gssd_flags=""			# Flags for gssd.
 
 rwhod_enable="NO"		# Run the rwho daemon (or NO).

Modified: head/etc/rc.d/gssd
==============================================================================
--- head/etc/rc.d/gssd	Fri Aug 29 02:21:02 2014	(r270779)
+++ head/etc/rc.d/gssd	Fri Aug 29 06:23:00 2014	(r270780)
@@ -9,10 +9,8 @@
 
 . /etc/rc.subr
 
-name="gssd"
+name=gssd
+rcvar=gssd_enable
 
 load_rc_config $name
-rcvar="gssd_enable"
-command="${gssd:-/usr/sbin/${name}}"
-eval ${name}_flags=\"${gssd_flags}\"
 run_rc_command "$1"