1574. [bug] Don't attempt to open the controls socket(s) when

running tests. [RT #9091]
2025-08-31 06:25:31 +00:00 · 2004-03-02 02:01:41 +00:00
parent d970376259
commit 821644d49b
61 changed files with 183 additions and 63 deletions
--- a/4
+++ b/4
@@ -26,7 +26,9 @@

 1575.	[func]		Log TSIG name on TSIG verify failure. [RT #4404]

-1574.	[placeholder]	rt9091
+1574.	[bug]		Don't attempt to open the controls socket(s) when
+			running tests. [RT #9091]
+

 1573.	[port]		linux: update to libtool 1.5.2 so that
 			"make install DESTDIR=/xx" works with
--- a/bin/tests/system/cacheclean/ns1/named.conf
+++ b/bin/tests/system/cacheclean/ns1/named.conf
@@ -15,7 +15,9 @@
 * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/* $Id: named.conf,v 1.2 2001/04/10 21:51:03 bwelling Exp $ */
+/* $Id: named.conf,v 1.3 2004/03/02 02:01:14 marka Exp $ */
+
+controls { /* empty */ };

 options {
 	query-source address 10.53.0.1;
--- a/bin/tests/system/cacheclean/ns2/named.conf
+++ b/bin/tests/system/cacheclean/ns2/named.conf
@@ -15,7 +15,9 @@
 * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/* $Id: named.conf,v 1.2 2001/04/10 21:51:05 bwelling Exp $ */
+/* $Id: named.conf,v 1.3 2004/03/02 02:01:15 marka Exp $ */
+
+controls { /* empty */ };

 options {
 	query-source address 10.53.0.2;
--- a/bin/tests/system/checknames/ns1/named.conf
+++ b/bin/tests/system/checknames/ns1/named.conf
@@ -2,7 +2,9 @@
 * Copyright
 */

-/* $Id: named.conf,v 1.2 2004/02/27 20:44:08 marka Exp $ */
+/* $Id: named.conf,v 1.3 2004/03/02 02:01:15 marka Exp $ */
+
+controls { /* empty */ };

 options {
        query-source address 10.53.0.1;
--- a/bin/tests/system/checknames/ns2/named.conf
+++ b/bin/tests/system/checknames/ns2/named.conf
@@ -2,7 +2,9 @@
 * Copyright
 */

-/* $Id: named.conf,v 1.2 2004/02/27 20:44:08 marka Exp $ */
+/* $Id: named.conf,v 1.3 2004/03/02 02:01:16 marka Exp $ */
+
+controls { /* empty */ };

 options {
        query-source address 10.53.0.2;
--- a/bin/tests/system/checknames/ns3/named.conf
+++ b/bin/tests/system/checknames/ns3/named.conf
@@ -2,7 +2,9 @@
 * Copyright
 */

-/* $Id: named.conf,v 1.2 2004/02/27 20:44:09 marka Exp $ */
+/* $Id: named.conf,v 1.3 2004/03/02 02:01:16 marka Exp $ */
+
+controls { /* empty */ };

 options {
        query-source address 10.53.0.3;
--- a/bin/tests/system/dialup/ns1/named.conf
+++ b/bin/tests/system/dialup/ns1/named.conf
@@ -15,7 +15,9 @@
 * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/* $Id: named.conf,v 1.4 2001/01/09 21:42:35 bwelling Exp $ */
+/* $Id: named.conf,v 1.5 2004/03/02 02:01:17 marka Exp $ */
+
+controls { /* empty */ };

 options {
 	query-source address 10.53.0.1;
--- a/bin/tests/system/dialup/ns2/named.conf
+++ b/bin/tests/system/dialup/ns2/named.conf
@@ -15,7 +15,9 @@
 * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/* $Id: named.conf,v 1.4 2001/01/09 21:42:38 bwelling Exp $ */
+/* $Id: named.conf,v 1.5 2004/03/02 02:01:17 marka Exp $ */
+
+controls { /* empty */ };

 options {
 	query-source address 10.53.0.2;
--- a/bin/tests/system/dialup/ns3/named.conf
+++ b/bin/tests/system/dialup/ns3/named.conf
@@ -15,7 +15,9 @@
 * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/* $Id: named.conf,v 1.4 2001/01/09 21:42:41 bwelling Exp $ */
+/* $Id: named.conf,v 1.5 2004/03/02 02:01:17 marka Exp $ */
+
+controls { /* empty */ };

 options {
 	query-source address 10.53.0.3;
--- a/bin/tests/system/dnssec/ns1/named.conf
+++ b/bin/tests/system/dnssec/ns1/named.conf
@@ -15,10 +15,12 @@
 * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/* $Id: named.conf,v 1.17 2004/02/17 03:40:20 marka Exp $ */
+/* $Id: named.conf,v 1.18 2004/03/02 02:01:18 marka Exp $ */

 // NS1

+controls { /* empty */ };
+
 options {
 	query-source address 10.53.0.1;
 	notify-source 10.53.0.1;
--- a/bin/tests/system/dnssec/ns2/named.conf
+++ b/bin/tests/system/dnssec/ns2/named.conf
@@ -15,10 +15,12 @@
 * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/* $Id: named.conf,v 1.20 2004/02/17 03:40:21 marka Exp $ */
+/* $Id: named.conf,v 1.21 2004/03/02 02:01:18 marka Exp $ */

 // NS2

+controls { /* empty */ };
+
 options {
 	query-source address 10.53.0.2;
 	notify-source 10.53.0.2;
--- a/bin/tests/system/dnssec/ns3/named.conf
+++ b/bin/tests/system/dnssec/ns3/named.conf
@@ -15,10 +15,12 @@
 * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/* $Id: named.conf,v 1.22 2004/02/17 03:40:21 marka Exp $ */
+/* $Id: named.conf,v 1.23 2004/03/02 02:01:19 marka Exp $ */

 // NS3

+controls { /* empty */ };
+
 options {
 	query-source address 10.53.0.3;
 	notify-source 10.53.0.3;
--- a/bin/tests/system/dnssec/ns4/named.conf
+++ b/bin/tests/system/dnssec/ns4/named.conf
@@ -15,10 +15,12 @@
 * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/* $Id: named.conf,v 1.19 2004/02/17 03:40:21 marka Exp $ */
+/* $Id: named.conf,v 1.20 2004/03/02 02:01:19 marka Exp $ */

 // NS4

+controls { /* empty */ };
+
 options {
 	query-source address 10.53.0.4;
 	notify-source 10.53.0.4;
--- a/bin/tests/system/dnssec/ns5/named.conf
+++ b/bin/tests/system/dnssec/ns5/named.conf
@@ -15,10 +15,12 @@
 * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/* $Id: named.conf,v 1.17 2004/02/17 03:40:21 marka Exp $ */
+/* $Id: named.conf,v 1.18 2004/03/02 02:01:20 marka Exp $ */

 // NS5

+controls { /* empty */ };
+
 options {
 	query-source address 10.53.0.5;
 	notify-source 10.53.0.5;
--- a/bin/tests/system/dnssec/ns6/named.conf
+++ b/bin/tests/system/dnssec/ns6/named.conf
@@ -15,10 +15,12 @@
 * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/* $Id: named.conf,v 1.3 2004/02/17 03:40:22 marka Exp $ */
+/* $Id: named.conf,v 1.4 2004/03/02 02:01:20 marka Exp $ */

 // NS6

+controls { /* empty */ };
+
 options {
 	query-source address 10.53.0.6;
 	notify-source 10.53.0.6;
--- a/bin/tests/system/forward/ns1/named.conf
+++ b/bin/tests/system/forward/ns1/named.conf
@@ -15,7 +15,9 @@
 * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/* $Id: named.conf,v 1.7 2001/03/09 18:49:54 bwelling Exp $ */
+/* $Id: named.conf,v 1.8 2004/03/02 02:01:20 marka Exp $ */
+
+controls { /* empty */ };

 options {
 	query-source address 10.53.0.1;
--- a/bin/tests/system/forward/ns2/named.conf
+++ b/bin/tests/system/forward/ns2/named.conf
@@ -15,7 +15,9 @@
 * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/* $Id: named.conf,v 1.7 2001/03/09 18:49:55 bwelling Exp $ */
+/* $Id: named.conf,v 1.8 2004/03/02 02:01:21 marka Exp $ */
+
+controls { /* empty */ };

 options {
 	query-source address 10.53.0.2;
--- a/bin/tests/system/forward/ns3/named.conf
+++ b/bin/tests/system/forward/ns3/named.conf
@@ -15,7 +15,9 @@
 * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/* $Id: named.conf,v 1.7 2001/03/09 18:49:56 bwelling Exp $ */
+/* $Id: named.conf,v 1.8 2004/03/02 02:01:21 marka Exp $ */
+
+controls { /* empty */ };

 options {
 	query-source address 10.53.0.3;
--- a/bin/tests/system/forward/ns4/named.conf
+++ b/bin/tests/system/forward/ns4/named.conf
@@ -15,7 +15,9 @@
 * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/* $Id: named.conf,v 1.7 2001/03/09 18:49:57 bwelling Exp $ */
+/* $Id: named.conf,v 1.8 2004/03/02 02:01:22 marka Exp $ */
+
+controls { /* empty */ };

 options {
 	query-source address 10.53.0.4;
--- a/bin/tests/system/glue/ns1/named.conf
+++ b/bin/tests/system/glue/ns1/named.conf
@@ -15,7 +15,9 @@
 * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/* $Id: named.conf,v 1.8 2001/01/09 21:43:22 bwelling Exp $ */
+/* $Id: named.conf,v 1.9 2004/03/02 02:01:22 marka Exp $ */
+
+controls { /* empty */ };

 options {
 	query-source address 10.53.0.1;
--- a/bin/tests/system/limits/ns1/named.conf
+++ b/bin/tests/system/limits/ns1/named.conf
@@ -15,7 +15,9 @@
 * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/* $Id: named.conf,v 1.10 2001/01/09 21:43:30 bwelling Exp $ */
+/* $Id: named.conf,v 1.11 2004/03/02 02:01:22 marka Exp $ */
+
+controls { /* empty */ };

 options {
 	query-source address 10.53.0.1;
--- a/bin/tests/system/lwresd/lwresd1/lwresd.conf
+++ b/bin/tests/system/lwresd/lwresd1/lwresd.conf
@@ -15,7 +15,9 @@
 * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/* $Id: lwresd.conf,v 1.4 2001/01/09 21:43:38 bwelling Exp $ */
+/* $Id: lwresd.conf,v 1.5 2004/03/02 02:01:23 marka Exp $ */
+
+controls { /* empty */ };

 options {
 	port 5300;
--- a/bin/tests/system/lwresd/ns1/named.conf
+++ b/bin/tests/system/lwresd/ns1/named.conf
@@ -15,7 +15,9 @@
 * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/* $Id: named.conf,v 1.12 2004/02/17 03:40:22 marka Exp $ */
+/* $Id: named.conf,v 1.13 2004/03/02 02:01:23 marka Exp $ */
+
+controls { /* empty */ };

 options {
 	query-source address 10.53.0.1;
--- a/bin/tests/system/masterfile/ns1/named.conf
+++ b/bin/tests/system/masterfile/ns1/named.conf
@@ -15,7 +15,9 @@
 * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/* $Id: named.conf,v 1.2 2001/08/09 00:33:42 gson Exp $ */
+/* $Id: named.conf,v 1.3 2004/03/02 02:01:23 marka Exp $ */
+
+controls { /* empty */ };

 options {
 	query-source address 10.53.0.1;
--- a/bin/tests/system/notify/ns1/named.conf
+++ b/bin/tests/system/notify/ns1/named.conf
@@ -15,7 +15,9 @@
 * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/* $Id: named.conf,v 1.14 2001/01/09 21:43:51 bwelling Exp $ */
+/* $Id: named.conf,v 1.15 2004/03/02 02:01:24 marka Exp $ */
+
+controls { /* empty */ };

 options {
 	query-source address 10.53.0.1;
--- a/bin/tests/system/notify/ns2/named.conf
+++ b/bin/tests/system/notify/ns2/named.conf
@@ -15,7 +15,9 @@
 * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/* $Id: named.conf,v 1.16 2001/01/11 20:41:41 gson Exp $ */
+/* $Id: named.conf,v 1.17 2004/03/02 02:01:24 marka Exp $ */
+
+controls { /* empty */ };

 options {
 	query-source address 10.53.0.2;
--- a/bin/tests/system/notify/ns3/named.conf
+++ b/bin/tests/system/notify/ns3/named.conf
@@ -15,7 +15,9 @@
 * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/* $Id: named.conf,v 1.19 2001/03/02 02:44:51 bwelling Exp $ */
+/* $Id: named.conf,v 1.20 2004/03/02 02:01:25 marka Exp $ */
+
+controls { /* empty */ };

 options {
 	query-source address 10.53.0.3;
--- a/bin/tests/system/nsupdate/ns1/named.conf
+++ b/bin/tests/system/nsupdate/ns1/named.conf
@@ -15,7 +15,9 @@
 * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/* $Id: named.conf,v 1.10 2001/03/08 02:59:47 bwelling Exp $ */
+/* $Id: named.conf,v 1.11 2004/03/02 02:01:25 marka Exp $ */
+
+controls { /* empty */ };

 options {
 	query-source address 10.53.0.1;
--- a/bin/tests/system/nsupdate/ns2/named.conf
+++ b/bin/tests/system/nsupdate/ns2/named.conf
@@ -15,7 +15,9 @@
 * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/* $Id: named.conf,v 1.9 2001/01/09 21:44:10 bwelling Exp $ */
+/* $Id: named.conf,v 1.10 2004/03/02 02:01:27 marka Exp $ */
+
+controls { /* empty */ };

 options {
 	query-source address 10.53.0.2;
--- a/bin/tests/system/relay/ns1/named.conf
+++ b/bin/tests/system/relay/ns1/named.conf
@@ -15,7 +15,9 @@
 * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/* $Id: named.conf,v 1.6 2001/01/09 21:44:16 bwelling Exp $ */
+/* $Id: named.conf,v 1.7 2004/03/02 02:01:27 marka Exp $ */
+
+controls { /* empty */ };

 options {
 	query-source address 10.53.0.1;
--- a/bin/tests/system/relay/ns2/named.conf
+++ b/bin/tests/system/relay/ns2/named.conf
@@ -15,7 +15,9 @@
 * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/* $Id: named.conf,v 1.6 2001/01/11 20:41:47 gson Exp $ */
+/* $Id: named.conf,v 1.7 2004/03/02 02:01:28 marka Exp $ */
+
+controls { /* empty */ };

 options {
 	query-source address 10.53.0.2;
--- a/bin/tests/system/relay/ns3/named.conf
+++ b/bin/tests/system/relay/ns3/named.conf
@@ -15,7 +15,9 @@
 * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/* $Id: named.conf,v 1.8 2001/01/11 20:41:49 gson Exp $ */
+/* $Id: named.conf,v 1.9 2004/03/02 02:01:28 marka Exp $ */
+
+controls { /* empty */ };

 options {
 	query-source address 10.53.0.3;
--- a/bin/tests/system/relay/ns4/named.conf
+++ b/bin/tests/system/relay/ns4/named.conf
@@ -15,7 +15,9 @@
 * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/* $Id: named.conf,v 1.8 2001/01/11 20:41:52 gson Exp $ */
+/* $Id: named.conf,v 1.9 2004/03/02 02:01:29 marka Exp $ */
+
+controls { /* empty */ };

 options {
 	query-source address 10.53.0.4;
--- a/bin/tests/system/resolver/ns1/named.conf
+++ b/bin/tests/system/resolver/ns1/named.conf
@@ -15,7 +15,9 @@
 * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/* $Id: named.conf,v 1.8 2001/01/09 21:44:34 bwelling Exp $ */
+/* $Id: named.conf,v 1.9 2004/03/02 02:01:29 marka Exp $ */
+
+controls { /* empty */ };

 options {
 	query-source address 10.53.0.1;
--- a/bin/tests/system/sortlist/ns1/named.conf
+++ b/bin/tests/system/sortlist/ns1/named.conf
@@ -15,7 +15,9 @@
 * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/* $Id: named.conf,v 1.6 2001/10/30 20:19:34 gson Exp $ */
+/* $Id: named.conf,v 1.7 2004/03/02 02:01:30 marka Exp $ */
+
+controls { /* empty */ };

 options {
 	query-source address 10.53.0.1;
--- a/bin/tests/system/stress/ns1/named.conf
+++ b/bin/tests/system/stress/ns1/named.conf
@@ -15,7 +15,9 @@
 * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/* $Id: named.conf,v 1.2 2001/01/09 21:44:48 bwelling Exp $ */
+/* $Id: named.conf,v 1.3 2004/03/02 02:01:30 marka Exp $ */
+
+controls { /* empty */ };

 options {
 	query-source address 10.53.0.1;
--- a/bin/tests/system/stress/ns2/named.conf
+++ b/bin/tests/system/stress/ns2/named.conf
@@ -15,7 +15,9 @@
 * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/* $Id: named.conf,v 1.3 2001/01/09 21:44:51 bwelling Exp $ */
+/* $Id: named.conf,v 1.4 2004/03/02 02:01:30 marka Exp $ */
+
+controls { /* empty */ };

 options {
 	query-source address 10.53.0.2;
--- a/bin/tests/system/stress/ns3/named.conf
+++ b/bin/tests/system/stress/ns3/named.conf
@@ -15,7 +15,9 @@
 * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/* $Id: named.conf,v 1.3 2001/01/09 21:44:52 bwelling Exp $ */
+/* $Id: named.conf,v 1.4 2004/03/02 02:01:31 marka Exp $ */
+
+controls { /* empty */ };

 options {
 	query-source address 10.53.0.3;
--- a/bin/tests/system/stress/ns4/named.conf
+++ b/bin/tests/system/stress/ns4/named.conf
@@ -15,7 +15,9 @@
 * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/* $Id: named.conf,v 1.3 2001/01/09 21:44:53 bwelling Exp $ */
+/* $Id: named.conf,v 1.4 2004/03/02 02:01:31 marka Exp $ */
+
+controls { /* empty */ };

 options {
 	query-source address 10.53.0.4;
--- a/bin/tests/system/stub/ns1/named.conf
+++ b/bin/tests/system/stub/ns1/named.conf
@@ -15,7 +15,9 @@
 * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/* $Id: named.conf,v 1.10 2001/01/09 21:44:57 bwelling Exp $ */
+/* $Id: named.conf,v 1.11 2004/03/02 02:01:32 marka Exp $ */
+
+controls { /* empty */ };

 options {
 	query-source address 10.53.0.1;
--- a/bin/tests/system/stub/ns2/named.conf
+++ b/bin/tests/system/stub/ns2/named.conf
@@ -15,7 +15,9 @@
 * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/* $Id: named.conf,v 1.10 2001/01/11 20:41:54 gson Exp $ */
+/* $Id: named.conf,v 1.11 2004/03/02 02:01:32 marka Exp $ */
+
+controls { /* empty */ };

 options {
 	query-source address 10.53.0.2;
--- a/bin/tests/system/stub/ns3/named.conf
+++ b/bin/tests/system/stub/ns3/named.conf
@@ -15,7 +15,9 @@
 * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/* $Id: named.conf,v 1.11 2001/01/11 20:41:57 gson Exp $ */
+/* $Id: named.conf,v 1.12 2004/03/02 02:01:32 marka Exp $ */
+
+controls { /* empty */ };

 options {
 	query-source address 10.53.0.3;
--- a/bin/tests/system/tkey/ns1/named.conf.in
+++ b/bin/tests/system/tkey/ns1/named.conf.in
@@ -15,7 +15,9 @@
 * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/* $Id: named.conf.in,v 1.2 2001/01/11 20:51:18 bwelling Exp $ */
+/* $Id: named.conf.in,v 1.3 2004/03/02 02:01:33 marka Exp $ */
+
+controls { /* empty */ };

 options {
 	query-source address 10.53.0.1;
--- a/bin/tests/system/unknown/ns1/named.conf
+++ b/bin/tests/system/unknown/ns1/named.conf
@@ -15,7 +15,9 @@
 * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/* $Id: named.conf,v 1.7 2001/01/09 21:45:17 bwelling Exp $ */
+/* $Id: named.conf,v 1.8 2004/03/02 02:01:33 marka Exp $ */
+
+controls { /* empty */ };

 options {
 	query-source address 10.53.0.1;
--- a/bin/tests/system/upforwd/ns1/named.conf
+++ b/bin/tests/system/upforwd/ns1/named.conf
@@ -15,13 +15,15 @@
 * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/* $Id: named.conf,v 1.6 2001/01/09 21:45:23 bwelling Exp $ */
+/* $Id: named.conf,v 1.7 2004/03/02 02:01:34 marka Exp $ */

 key "update.example." {
 	algorithm "hmac-md5";
 	secret "c3Ryb25nIGVub3VnaCBmb3IgYSBtYW4gYnV0IG1hZGUgZm9yIGEgd29tYW4K";
 };

+controls { /* empty */ };
+
 options {
 	query-source address 10.53.0.1;
 	notify-source 10.53.0.1;
--- a/bin/tests/system/upforwd/ns2/named.conf
+++ b/bin/tests/system/upforwd/ns2/named.conf
@@ -15,7 +15,9 @@
 * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/* $Id: named.conf,v 1.5 2001/01/09 21:45:25 bwelling Exp $ */
+/* $Id: named.conf,v 1.6 2004/03/02 02:01:34 marka Exp $ */
+
+controls { /* empty */ };

 options {
 	query-source address 10.53.0.2;
--- a/bin/tests/system/upforwd/ns3/named.conf
+++ b/bin/tests/system/upforwd/ns3/named.conf
@@ -15,7 +15,9 @@
 * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/* $Id: named.conf,v 1.5 2001/01/09 21:45:26 bwelling Exp $ */
+/* $Id: named.conf,v 1.6 2004/03/02 02:01:35 marka Exp $ */
+
+controls { /* empty */ };

 options {
 	query-source address 10.53.0.3;
--- a/bin/tests/system/v6synth/ns1/named.conf
+++ b/bin/tests/system/v6synth/ns1/named.conf
@@ -15,7 +15,9 @@
 * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/* $Id: named.conf,v 1.1 2001/01/10 01:18:28 gson Exp $ */
+/* $Id: named.conf,v 1.2 2004/03/02 02:01:35 marka Exp $ */
+
+controls { /* empty */ };

 options {
 	query-source address 10.53.0.1;
--- a/bin/tests/system/v6synth/ns2/named.conf
+++ b/bin/tests/system/v6synth/ns2/named.conf
@@ -15,7 +15,9 @@
 * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/* $Id: named.conf,v 1.1 2001/01/10 01:18:28 gson Exp $ */
+/* $Id: named.conf,v 1.2 2004/03/02 02:01:36 marka Exp $ */
+
+controls { /* empty */ };

 options {
 	query-source address 10.53.0.2;
--- a/bin/tests/system/v6synth/ns3/named.conf
+++ b/bin/tests/system/v6synth/ns3/named.conf
@@ -15,7 +15,9 @@
 * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/* $Id: named.conf,v 1.1 2001/01/10 01:18:29 gson Exp $ */
+/* $Id: named.conf,v 1.2 2004/03/02 02:01:36 marka Exp $ */
+
+controls { /* empty */ };

 options {
 	query-source address 10.53.0.3;
--- a/bin/tests/system/views/ns1/named.conf
+++ b/bin/tests/system/views/ns1/named.conf
@@ -15,7 +15,9 @@
 * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/* $Id: named.conf,v 1.13 2001/01/09 21:45:31 bwelling Exp $ */
+/* $Id: named.conf,v 1.14 2004/03/02 02:01:37 marka Exp $ */
+
+controls { /* empty */ };

 options {
 	query-source address 10.53.0.1;
--- a/bin/tests/system/views/ns2/named1.conf
+++ b/bin/tests/system/views/ns2/named1.conf
@@ -15,7 +15,9 @@
 * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/* $Id: named1.conf,v 1.16 2001/01/11 20:41:59 gson Exp $ */
+/* $Id: named1.conf,v 1.17 2004/03/02 02:01:37 marka Exp $ */
+
+controls { /* empty */ };

 options {
 	query-source address 10.53.0.2;
--- a/bin/tests/system/views/ns2/named2.conf
+++ b/bin/tests/system/views/ns2/named2.conf
@@ -15,7 +15,9 @@
 * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/* $Id: named2.conf,v 1.18 2001/01/11 20:42:00 gson Exp $ */
+/* $Id: named2.conf,v 1.19 2004/03/02 02:01:37 marka Exp $ */
+
+controls { /* empty */ };

 options {
 	query-source address 10.53.0.2;
--- a/bin/tests/system/views/ns3/named1.conf
+++ b/bin/tests/system/views/ns3/named1.conf
@@ -15,7 +15,9 @@
 * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/* $Id: named1.conf,v 1.15 2001/01/11 20:42:03 gson Exp $ */
+/* $Id: named1.conf,v 1.16 2004/03/02 02:01:38 marka Exp $ */
+
+controls { /* empty */ };

 options {
 	query-source address 10.53.0.3;
--- a/bin/tests/system/views/ns3/named2.conf
+++ b/bin/tests/system/views/ns3/named2.conf
@@ -15,7 +15,9 @@
 * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/* $Id: named2.conf,v 1.15 2001/01/11 20:42:04 gson Exp $ */
+/* $Id: named2.conf,v 1.16 2004/03/02 02:01:38 marka Exp $ */
+
+controls { /* empty */ };

 options {
 	query-source address 10.53.0.3;
--- a/bin/tests/system/xfer/ns1/named.conf
+++ b/bin/tests/system/xfer/ns1/named.conf
@@ -15,7 +15,9 @@
 * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/* $Id: named.conf,v 1.14 2001/01/09 21:45:47 bwelling Exp $ */
+/* $Id: named.conf,v 1.15 2004/03/02 02:01:38 marka Exp $ */
+
+controls { /* empty */ };

 options {
 	query-source address 10.53.0.1;
--- a/bin/tests/system/xfer/ns2/named.conf
+++ b/bin/tests/system/xfer/ns2/named.conf
@@ -15,7 +15,9 @@
 * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/* $Id: named.conf,v 1.16 2001/09/08 00:24:30 gson Exp $ */
+/* $Id: named.conf,v 1.17 2004/03/02 02:01:39 marka Exp $ */
+
+controls { /* empty */ };

 options {
 	query-source address 10.53.0.2;
--- a/bin/tests/system/xfer/ns3/named.conf
+++ b/bin/tests/system/xfer/ns3/named.conf
@@ -15,7 +15,9 @@
 * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/* $Id: named.conf,v 1.16 2001/09/08 00:24:31 gson Exp $ */
+/* $Id: named.conf,v 1.17 2004/03/02 02:01:39 marka Exp $ */
+
+controls { /* empty */ };

 options {
 	query-source address 10.53.0.3;
--- a/bin/tests/system/xferquota/ns1/named.conf
+++ b/bin/tests/system/xferquota/ns1/named.conf
@@ -15,7 +15,9 @@
 * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/* $Id: named.conf,v 1.17 2001/01/09 21:46:03 bwelling Exp $ */
+/* $Id: named.conf,v 1.18 2004/03/02 02:01:40 marka Exp $ */
+
+controls { /* empty */ };

 options {
 	query-source address 10.53.0.1;
--- a/bin/tests/system/xferquota/ns2/named.conf
+++ b/bin/tests/system/xferquota/ns2/named.conf
@@ -15,7 +15,9 @@
 * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/* $Id: named.conf,v 1.17 2001/01/11 20:42:11 gson Exp $ */
+/* $Id: named.conf,v 1.18 2004/03/02 02:01:40 marka Exp $ */
+
+controls { /* empty */ };

 options {
 	query-source address 10.53.0.2;
--- a/lib/dns/rdata/in_1/srv_33.c
+++ b/lib/dns/rdata/in_1/srv_33.c
@@ -15,7 +15,7 @@
 * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */

-/* $Id: srv_33.c,v 1.39 2004/02/27 20:41:50 marka Exp $ */
+/* $Id: srv_33.c,v 1.40 2004/03/02 02:01:41 marka Exp $ */

 /* Reviewed: Fri Mar 17 13:01:00 PST 2000 by bwelling */

@@ -337,8 +337,8 @@ digest_in_srv(ARGS_DIGEST) {
 static inline isc_boolean_t
 checkowner_in_srv(ARGS_CHECKOWNER) {

-	REQUIRE(type == 250);
-	REQUIRE(rdclass == 255);
+	REQUIRE(type == 33);
+	REQUIRE(rdclass == 1);

 	UNUSED(name);
 	UNUSED(type);