| 1 |
idl0r 10/09/03 17:52:01 |
| 2 |
|
| 3 |
Modified: named.init-r7 named.init-r5 named.conf-r4 |
| 4 |
Log: |
| 5 |
Minor files/named.conf-r4 fixes. Remove "stop" argument from the stop() function of the init script, bug 335398. |
| 6 |
|
| 7 |
(Portage version: 2.2_rc74/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.6 net-dns/bind/files/named.init-r7 |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/bind/files/named.init-r7?rev=1.6&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/bind/files/named.init-r7?rev=1.6&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/bind/files/named.init-r7?r1=1.5&r2=1.6 |
| 15 |
|
| 16 |
Index: named.init-r7 |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.init-r7,v |
| 19 |
retrieving revision 1.5 |
| 20 |
retrieving revision 1.6 |
| 21 |
diff -u -r1.5 -r1.6 |
| 22 |
--- named.init-r7 26 Aug 2010 16:03:41 -0000 1.5 |
| 23 |
+++ named.init-r7 3 Sep 2010 17:52:01 -0000 1.6 |
| 24 |
@@ -1,7 +1,7 @@ |
| 25 |
#!/sbin/runscript |
| 26 |
# Copyright 1999-2010 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.init-r7,v 1.5 2010/08/26 16:03:41 idl0r Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.init-r7,v 1.6 2010/09/03 17:52:01 idl0r Exp $ |
| 30 |
|
| 31 |
opts="start stop reload restart" |
| 32 |
|
| 33 |
@@ -117,11 +117,11 @@ |
| 34 |
|
| 35 |
ebegin "Stopping ${CHROOT:+chrooted }named" |
| 36 |
checkconfig || return 2 |
| 37 |
- if [ -f $RNDC_KEY ] ; then |
| 38 |
+ if [[ -n "${RNDC_KEY}" && -f "${RNDC_KEY}" ]] ; then |
| 39 |
rndc $SERVER -k $RNDC_KEY stop &>/dev/null |
| 40 |
else |
| 41 |
start-stop-daemon --stop --quiet --pidfile $PIDFILE \ |
| 42 |
- --exec /usr/sbin/named -- stop |
| 43 |
+ --exec /usr/sbin/named |
| 44 |
fi |
| 45 |
|
| 46 |
if [[ -n ${CHROOT} ]]; |
| 47 |
|
| 48 |
|
| 49 |
|
| 50 |
1.3 net-dns/bind/files/named.init-r5 |
| 51 |
|
| 52 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/bind/files/named.init-r5?rev=1.3&view=markup |
| 53 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/bind/files/named.init-r5?rev=1.3&content-type=text/plain |
| 54 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/bind/files/named.init-r5?r1=1.2&r2=1.3 |
| 55 |
|
| 56 |
Index: named.init-r5 |
| 57 |
=================================================================== |
| 58 |
RCS file: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.init-r5,v |
| 59 |
retrieving revision 1.2 |
| 60 |
retrieving revision 1.3 |
| 61 |
diff -u -r1.2 -r1.3 |
| 62 |
--- named.init-r5 26 Aug 2010 16:03:41 -0000 1.2 |
| 63 |
+++ named.init-r5 3 Sep 2010 17:52:01 -0000 1.3 |
| 64 |
@@ -1,7 +1,7 @@ |
| 65 |
#!/sbin/runscript |
| 66 |
# Copyright 1999-2010 Gentoo Foundation |
| 67 |
# Distributed under the terms of the GNU General Public License v2 |
| 68 |
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.init-r5,v 1.2 2010/08/26 16:03:41 idl0r Exp $ |
| 69 |
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.init-r5,v 1.3 2010/09/03 17:52:01 idl0r Exp $ |
| 70 |
|
| 71 |
opts="start stop reload restart" |
| 72 |
|
| 73 |
@@ -56,7 +56,7 @@ |
| 74 |
rndc -k $KEY stop &>/dev/null |
| 75 |
else |
| 76 |
start-stop-daemon --stop --quiet --pidfile $PIDFILE \ |
| 77 |
- --exec /usr/sbin/named -- stop |
| 78 |
+ --exec /usr/sbin/named |
| 79 |
fi |
| 80 |
eend $? |
| 81 |
} |
| 82 |
|
| 83 |
|
| 84 |
|
| 85 |
1.5 net-dns/bind/files/named.conf-r4 |
| 86 |
|
| 87 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/bind/files/named.conf-r4?rev=1.5&view=markup |
| 88 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/bind/files/named.conf-r4?rev=1.5&content-type=text/plain |
| 89 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/bind/files/named.conf-r4?r1=1.4&r2=1.5 |
| 90 |
|
| 91 |
Index: named.conf-r4 |
| 92 |
=================================================================== |
| 93 |
RCS file: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.conf-r4,v |
| 94 |
retrieving revision 1.4 |
| 95 |
retrieving revision 1.5 |
| 96 |
diff -u -r1.4 -r1.5 |
| 97 |
--- named.conf-r4 25 Jul 2010 18:57:42 -0000 1.4 |
| 98 |
+++ named.conf-r4 3 Sep 2010 17:52:01 -0000 1.5 |
| 99 |
@@ -31,7 +31,7 @@ |
| 100 |
pid-file "/var/run/named/named.pid"; |
| 101 |
|
| 102 |
/* https://www.isc.org/solutions/dlv >=bind-9.7.x only */ |
| 103 |
- //bindkeys-file "/etc/bind/bind.keys"; |
| 104 |
+ // bindkeys-file "/etc/bind/bind.keys"; |
| 105 |
|
| 106 |
listen-on-v6 { ::1; }; |
| 107 |
listen-on { 127.0.0.1; }; |
| 108 |
@@ -80,7 +80,8 @@ |
| 109 |
|
| 110 |
*/ |
| 111 |
|
| 112 |
- //dnssec-enable yes; |
| 113 |
+ // dnssec-enable yes; |
| 114 |
+ // dnssec-validation yes; |
| 115 |
|
| 116 |
/* if you have problems and are behind a firewall: */ |
| 117 |
//query-source address * port 53; |
Archives