From owner-svn-src-head@FreeBSD.ORG  Fri Jan  1 22:10:08 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 812281065692;
	Fri,  1 Jan 2010 22:10:08 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 70B628FC0A;
	Fri,  1 Jan 2010 22:10:08 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o01MA8TC040737;
	Fri, 1 Jan 2010 22:10:08 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o01MA83Q040736;
	Fri, 1 Jan 2010 22:10:08 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201001012210.o01MA83Q040736@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Fri, 1 Jan 2010 22:10:08 +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: r201370 - head/etc/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: Fri, 01 Jan 2010 22:10:08 -0000

Author: dougb
Date: Fri Jan  1 22:10:07 2010
New Revision: 201370
URL: http://svn.freebsd.org/changeset/base/201370

Log:
  s/named_confidr/named_confdir/ in the rndc.key check. The line in
  the command to create it was right, but the check was wrong, so it
  was getting created every time. Mea culpa.
  
  Submitted by:	oliver

Modified:
  head/etc/rc.d/named

Modified: head/etc/rc.d/named
==============================================================================
--- head/etc/rc.d/named	Fri Jan  1 20:55:11 2010	(r201369)
+++ head/etc/rc.d/named	Fri Jan  1 22:10:07 2010	(r201370)
@@ -183,8 +183,8 @@ named_prestart()
 	if [ -s "${named_confdir}/rndc.conf" ]; then
 		unset confgen_command
 	fi
-	if [ -s "${named_confidr}/rndc.key" ]; then
-		case `stat -f%Su ${named_confidr}/rndc.key` in
+	if [ -s "${named_confdir}/rndc.key" ]; then
+		case `stat -f%Su ${named_confdir}/rndc.key` in
 		root|$named_uid) ;;
 		*) $confgen_command ;;
 		esac