Bug #306789: Depending on configuration, we might need to tell RNDC where to connect.

Package-Manager: portage-2.2_rc63/cvs/Linux x86_64

4 files changed, 15 insertions, 17 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/Manifest b/net-dns/bind/Manifest
index 267c91eafb9c..11d7c406b5ab 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 10bind.env 27 RMD160 872245707b4f72a212cda162c59495744d77a6e3 SHA1 7b8c1abd5910bb7a07c6b7c820c2b34a534b2593 SHA256 5ad6a4402372b43809618051873b63646746f400447bba30dc4dfecd028e3650
 AUX 127.zone-r1 533 RMD160 2795c6c27912a73ac45582f33de3182382db3a5d SHA1 87fcb2b96db4cef99d25fa87759dd32ea2ac5559 SHA256 0fa4c294640d4191710647d1b18a2099f22ff674b3a35e6e81ff929f921da626
 AUX bind-9.4.0-dlzbdb-close_cursor.patch 338 RMD160 3c92206a6c77ac8e9ea854dfc22fda5753b653a9 SHA1 903383e2b142d76a73030c27f2cdab8d100df150 SHA256 4a004d72565d6db683b879851ae8dfaddcf1b39fd0f97a995d9c5d22d72c6395
@@ -10,9 +7,9 @@ AUX localhost.zone-r3 426 RMD160 b2dfe76923695e6eac49234b7e7f90fef4d1838e SHA1 b
 AUX named.ca 2940 RMD160 a1a3c1fc88f50c2cd60a3a3dcd2c884f553d1095 SHA1 9feadfe326be6420acab24f262df312d631b1705 SHA256 80bc818ebd61bd2e40f25b1e1999a39dfa8be340ff6ada815a40b5e21ea30c14
 AUX named.conf-r3 1314 RMD160 b8189eaac58eb27b612eacc66826802748e145ca SHA1 d8b2af94a89472ed0b767bdebadcfebcbf6ddfd3 SHA256 ab2f7305e9a1d30406528c5ef079beb4970c89572e90d57bb5ddb27b8126ad13
 AUX named.confd-r2 479 RMD160 0a0452bf9bb6f18d4628ee72abe82a52d484a2cb SHA1 d0b0e2f5d72d43862c5aaff9a226fd8599992323 SHA256 bae05257852ecbc7f66bd30e452162f15b6f6e8c3fc170fb6dfdfa7d22361915
-AUX named.confd-r3 565 RMD160 3592e3e42a27a8a9e0a2a2728ebb5b993e31960c SHA1 b2ee0c6465612e480631f966da1047a17aefd5e4 SHA256 5bc18b263101663e089764c87941ac0c19e6030fe3011f6dba3eebbadfb536f2
+AUX named.confd-r3 648 RMD160 bb184a1f4d7476e874df37dd0b60638d6da608cb SHA1 21987e0fd4419276efb2d9551d2bde18eece6fb8 SHA256 6daf6f9eddc822eb434dcc651627f3dd8bdfbfa270b1b089724a87dc5fcc559a
 AUX named.init-r5 1620 RMD160 37279362e437241188a07e5f274730e68645827e SHA1 00a14819a322b391183084c79cc9a4dc04d0d484 SHA256 07fb9d653f086319680d04abde0218495ed09d3528087257788bf294252a0bad
-AUX named.init-r7 2717 RMD160 fd00883265443b762fa69135579a59cf350c75cd SHA1 340f41e153416d0c444750e5fbe17534cb44e40f SHA256 b10c1607500fccb2e58707c3c197e2bbe4c615bba06748baff34d53cb57bfbad
+AUX named.init-r7 2731 RMD160 3c6c7ea44bcf355862fdd1afb3bdbd03a9c95c71 SHA1 3745627a36e0c0cabdc9f632a8a39d7694c1d210 SHA256 3ac9f6f8fef5e29e77eb9520f34472775683dfa0f809ff01b03a50d03fad38d9
 DIST bind-9.4.3-P4.tar.gz 6545707 RMD160 e8757d67dbdeb6c0f2c88860214a48c1bd6c8132 SHA1 16686bec02960ba5541852031352acdc12971b7e SHA256 6374354f72a25335ae54799e84f2f0f90b94e8849084ef50709ea8eef8534fc9
 DIST bind-9.4.3-P5.tar.gz 6447497 RMD160 680146e4120aaa89f2899d4205c17fee5e9e4aa9 SHA1 9b7f0bd84be0f91fe1085cedc91c7c14f1e0f97a SHA256 7ca93553d1f488af1b21ab26f0297be5c7b7b5920d29ad9743382bf3623b2939
 DIST bind-9.6.1-P3.tar.gz 6508797 RMD160 ff444f39d7cf9673497e43c18c40dd77af121851 SHA1 9cb2bfb933083ab4e85aa884ca0dff7b0ae5cfb2 SHA256 869f5079a900b280c051d4c9cf7eefea000a0e70ccec9e6fcddd79e3caa10198
@@ -21,12 +18,5 @@ DIST dyndns-samples.tbz2 22866 RMD160 27d5b2d0edb8e1ff16b3f980c38d7af33ccf0c7d S
 EBUILD bind-9.4.3_p4.ebuild 9201 RMD160 3e407aee795291b7318e2a8c1b159cd6140797cd SHA1 3a23da428c952bbb4afc01f57df0eaaa627256e0 SHA256 7c0e66ce67adefa8c1ca2fa708422db219d3c56d6773df673d61ca382d71ca0f
 EBUILD bind-9.4.3_p5.ebuild 9210 RMD160 08f94fedd5d58dc80ff46ad613f1b2f14ac83722 SHA1 95f2bef0b8e6a9cb2f516e5562134ff174c36442 SHA256 062da83943403401a47ebf289f1176967842156635b5160b49f5b80f442ed96d
 EBUILD bind-9.6.1_p3.ebuild 9242 RMD160 06e6f37b48b1c91c5cad5ba186e61509475dd0be SHA1 3f48d1d4b31f994ce28c3f863085d7150a26a533 SHA256 17a4e497af24dc65025e4323e3138ed2cb2f0f2466b2cae4e860cb0af9896853
-MISC ChangeLog 41641 RMD160 12b17541f141b5bee01b1cfd7165cad22258a7a7 SHA1 adc8cf66b12bf6260bf1b990f2175a4a9d431a78 SHA256 af1974f385d9689d5fdca0cf7e2bd3811f9e5caf4f33be0fed71097e9556d3e1
+MISC ChangeLog 41832 RMD160 963e312fe6807deff0e9c39290f67784a9f35d16 SHA1 16d27f5702b4439a350bc7566d253b645d5e3956 SHA256 8e1b8a4936d9079c9afa7e43800341e0327f0ffc70ab6722a268ae9e9d5af8ff
 MISC metadata.xml 647 RMD160 63aeb182631d45c774bdc08f11901147028f6d7c SHA1 9aff80992005daa758d373c4e3311ff8c3ae3ef9 SHA256 9417c62e0e5817e26d36ab5efd87f126781dbf445d9a1beb3abb899b8cb4806a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAktfOk0ACgkQixe2jn+ufThPegCfdBXTzdCNfeKs78yj0XlJeUTH
-OtMAn1vsfcOQvHwtJPABz2g69jDOI/dr
-=3uYH
------END PGP SIGNATURE-----
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