diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2010-02-25 19:03:32 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2010-02-25 19:03:32 +0000 |
| commit | 19e06cf831abda7306c55f6752cfd4857cbda933 (patch) | |
| tree | 83ca0b123fefd401f19e967b847fe61e14704b50 /net-dns/bind | |
| parent | Fix ax_lib_expat.m4 macro to not use LDFLAGS for passing libraries wrt #30554... (diff) | |
| download | gentoo-2-19e06cf831abda7306c55f6752cfd4857cbda933.tar.gz gentoo-2-19e06cf831abda7306c55f6752cfd4857cbda933.tar.bz2 gentoo-2-19e06cf831abda7306c55f6752cfd4857cbda933.zip | |
Bug #306789: Depending on configuration, we might need to tell RNDC where to connect.
(Portage version: 2.2_rc63/cvs/Linux x86_64)
Diffstat (limited to 'net-dns/bind')
| -rw-r--r-- | net-dns/bind/ChangeLog | 7 | ||||
| -rw-r--r-- | net-dns/bind/files/named.confd-r3 | 3 | ||||
| -rw-r--r-- | net-dns/bind/files/named.init-r7 | 6 |
3 files changed, 12 insertions, 4 deletions
diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog index 66e909ad844a..596df3b8970b 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.256 2010/01/26 18:53:53 idl0r Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.257 2010/02/25 19:03:32 robbat2 Exp $ + + 25 Feb 2010; Robin H. Johnson <robbat2@gentoo.org> files/named.confd-r3, + files/named.init-r7: + Bug #306789: Depending on configuration, we might need to tell RNDC where + to connect. *bind-9.6.1_p3 (26 Jan 2010) *bind-9.4.3_p5 (26 Jan 2010) diff --git a/net-dns/bind/files/named.confd-r3 b/net-dns/bind/files/named.confd-r3 index 02fa8980c9a5..3d1694b516ee 100644 --- a/net-dns/bind/files/named.confd-r3 +++ b/net-dns/bind/files/named.confd-r3 @@ -6,6 +6,9 @@ OPTIONS="" # Leave this unchanged if you want bind to automatically detect the number #CPU="1" +# RNDC needs to be told what server we're using sometimes. +#SERVER="-s 127.0.0.1" + # If you wish to run bind in a chroot, run: # emerge --config =<bind-version> # and un-comment the following line. diff --git a/net-dns/bind/files/named.init-r7 b/net-dns/bind/files/named.init-r7 index 0ad8dca54cb1..b722db4f78ba 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-2009 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.1 2009/11/12 08:37:16 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.init-r7,v 1.2 2010/02/25 19:03:31 robbat2 Exp $ opts="start stop reload restart" @@ -95,7 +95,7 @@ stop() { ebegin "Stopping ${CHROOT:+chrooted }named" checkconfig || return 2 if [ -f $KEY ] ; then - rndc -k $KEY stop &>/dev/null + rndc $SERVER -k $KEY stop &>/dev/null else start-stop-daemon --stop --quiet --pidfile $PIDFILE \ --exec /usr/sbin/named -- stop @@ -133,7 +133,7 @@ reload() { if [ -f $KEY ] ; then ebegin "Reloading named.conf and zone files" - rndc -k $KEY reload &>/dev/null + rndc $SERVER -k $KEY reload &>/dev/null eend $? else /etc/init.d/named restart &>/dev/null fi |