Minor files/named.conf-r4 fixes. Remove "stop" argument from the stop() function of the init script, bug 335398.

(Portage version: 2.2_rc74/cvs/Linux x86_64)

4 files changed, 14 insertions, 8 deletions

diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog
index d80a10e55bc0..4585a07c3cf3 100644
--- a/net-dns/bind/ChangeLog
+++ b/net-dns/bind/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dns/bind
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.288 2010/08/26 16:03:41 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.289 2010/09/03 17:52:01 idl0r Exp $
+
+  03 Sep 2010; Christian Ruppert <idl0r@gentoo.org> files/named.conf-r4,
+  files/named.init-r5, files/named.init-r7:
+  Minor files/named.conf-r4 fixes. Remove "stop" argument from the stop()
+  function of the init script, bug 335398.
 
   26 Aug 2010; Christian Ruppert <idl0r@gentoo.org> files/named.init-r5,
   files/named.init-r7:
diff --git a/net-dns/bind/files/named.conf-r4 b/net-dns/bind/files/named.conf-r4
index d302794bc16c..35ee3644ea91 100644
--- a/net-dns/bind/files/named.conf-r4
+++ b/net-dns/bind/files/named.conf-r4
@@ -31,7 +31,7 @@ options {
 	pid-file "/var/run/named/named.pid";
 
 	/* https://www.isc.org/solutions/dlv >=bind-9.7.x only */
-	//bindkeys-file "/etc/bind/bind.keys";
+	// bindkeys-file "/etc/bind/bind.keys";
 
 	listen-on-v6 { ::1; };
 	listen-on { 127.0.0.1; };
@@ -80,7 +80,8 @@ options {
 
 */
 
-	//dnssec-enable yes;
+	// dnssec-enable yes;
+	// dnssec-validation yes;
 
 	/* if you have problems and are behind a firewall: */
 	//query-source address * port 53;
diff --git a/net-dns/bind/files/named.init-r5 b/net-dns/bind/files/named.init-r5
index de10032f158b..b06c74d4e32b 100755
--- a/net-dns/bind/files/named.init-r5
+++ b/net-dns/bind/files/named.init-r5
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.init-r5,v 1.2 2010/08/26 16:03:41 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.init-r5,v 1.3 2010/09/03 17:52:01 idl0r Exp $
 
 opts="start stop reload restart"
 
@@ -56,7 +56,7 @@ stop() {
 		rndc -k $KEY stop &>/dev/null
 	else
 		start-stop-daemon --stop --quiet --pidfile $PIDFILE \
-			--exec /usr/sbin/named -- stop
+			--exec /usr/sbin/named
 	fi
 	eend $?
 }
diff --git a/net-dns/bind/files/named.init-r7 b/net-dns/bind/files/named.init-r7
index ae887e9ecdfd..454b10158b3f 100644
--- a/net-dns/bind/files/named.init-r7
+++ b/net-dns/bind/files/named.init-r7
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.init-r7,v 1.5 2010/08/26 16:03:41 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.init-r7,v 1.6 2010/09/03 17:52:01 idl0r Exp $
 
 opts="start stop reload restart"
 
@@ -117,11 +117,11 @@ stop() {
 
 	ebegin "Stopping ${CHROOT:+chrooted }named"
 	checkconfig || return 2
-	if [ -f $RNDC_KEY ] ; then
+	if [[ -n "${RNDC_KEY}" && -f "${RNDC_KEY}" ]] ; then
 		rndc $SERVER -k $RNDC_KEY stop &>/dev/null
 	else
 		start-stop-daemon --stop --quiet --pidfile $PIDFILE \
-			--exec /usr/sbin/named -- stop
+			--exec /usr/sbin/named
 	fi
 
 	if [[ -n ${CHROOT} ]];