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

                        running tests. [RT #9091]

diff --git a/CHANGES b/CHANGES
index 27a1bb3221ca33a411d045922a864fc9d3fb7f67..abb4099d8d5a022c15a4ff7a1e21be0550b0f419 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -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

diff --git a/bin/tests/system/cacheclean/ns1/named.conf b/bin/tests/system/cacheclean/ns1/named.conf
index c394ed4fed6bc638d939e237fceb264e2c6f149f..dba48cd4202ccc37fe51cd3bec5b642f4d28e2b4 100644 (file)
--- 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;

diff --git a/bin/tests/system/cacheclean/ns2/named.conf b/bin/tests/system/cacheclean/ns2/named.conf
index 9bd38058cfa4afbf8bfabf53e1c2c7ddf6b70f4c..044db59d6c8c85824cc24d1c4a98d85c5d5f5780 100644 (file)
--- 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;

diff --git a/bin/tests/system/checknames/ns1/named.conf b/bin/tests/system/checknames/ns1/named.conf
index 64a0b40f3bff457d5a63a3917cf84fd21d277949..b4ed7928e4cccfa336efd1b48fb7a77e8eccdd93 100644 (file)
--- 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;

diff --git a/bin/tests/system/checknames/ns2/named.conf b/bin/tests/system/checknames/ns2/named.conf
index 9a2b7abd70b89a6a300ea69ca6087b6c57c77b54..76050251900ff95679630299f217b13319fbd8d9 100644 (file)
--- 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;

diff --git a/bin/tests/system/checknames/ns3/named.conf b/bin/tests/system/checknames/ns3/named.conf
index 329d8f1ee6589a9b1ed62f622286f1ba016b1ea7..32a535532b95d3aa38a303e2e3538a2fbc85006f 100644 (file)
--- 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;

diff --git a/bin/tests/system/dialup/ns1/named.conf b/bin/tests/system/dialup/ns1/named.conf
index d6c2f039f387d0e6792342113bdfc8f35ba27eb3..f34bc8aba94cb1c2f3ea926be74b60318f3e405e 100644 (file)
--- 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;

diff --git a/bin/tests/system/dialup/ns2/named.conf b/bin/tests/system/dialup/ns2/named.conf
index 7fc502c927220475c4eab156de13a64348536eb1..3cb0ed8f97f7737ff56dd118f46e2763432d145c 100644 (file)
--- 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;

diff --git a/bin/tests/system/dialup/ns3/named.conf b/bin/tests/system/dialup/ns3/named.conf
index 032612df08d2d9816ad997363629ad70f8bdd71b..b6919e15722f93d84b7bcd8556c169caa1d670ac 100644 (file)
--- 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;

diff --git a/bin/tests/system/dnssec/ns1/named.conf b/bin/tests/system/dnssec/ns1/named.conf
index 463fb77bb7c163704105a03e6fe1d6a5a589405b..6c98c7d1bb5d6087cf8bb567e1caf0ec55079b4e 100644 (file)
--- 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;

diff --git a/bin/tests/system/dnssec/ns2/named.conf b/bin/tests/system/dnssec/ns2/named.conf
index 6f464e6c2cfe14d02337a3d5064252ea41f4b883..0a436f8ae8b929b3d44e10e1e399a6d3b0e5608d 100644 (file)
--- 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;

diff --git a/bin/tests/system/dnssec/ns3/named.conf b/bin/tests/system/dnssec/ns3/named.conf
index 5deba648ecda803bdb650dbc642672edeff63ffa..db0105ba6d9904049f8257d1b4e500888fae484d 100644 (file)
--- 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;

diff --git a/bin/tests/system/dnssec/ns4/named.conf b/bin/tests/system/dnssec/ns4/named.conf
index 2f3a7e331b8f4ecfa0e933b7a1e5740a71ff9531..522ef323dcf11bbf0cfa60a47840979817b76ff5 100644 (file)
--- 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;

diff --git a/bin/tests/system/dnssec/ns5/named.conf b/bin/tests/system/dnssec/ns5/named.conf
index b068b895c40422ff764d39a91f49bd1f7ad3a70d..50e11285e211d65a7b5f1ba4aee913da27a673a4 100644 (file)
--- 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;

diff --git a/bin/tests/system/dnssec/ns6/named.conf b/bin/tests/system/dnssec/ns6/named.conf
index b1b8fb858d2bfe4e06fb31f2989807da6714718b..e3a679714270c037115e8ec7f447302e320760a5 100644 (file)
--- 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;

diff --git a/bin/tests/system/forward/ns1/named.conf b/bin/tests/system/forward/ns1/named.conf
index 69be8cab99e3952171916ab1347269e020579eee..9ddac73e2d0a569589fb56e8bd2f0264eb8986fd 100644 (file)
--- 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;

diff --git a/bin/tests/system/forward/ns2/named.conf b/bin/tests/system/forward/ns2/named.conf
index cdf2bf29b37847bce04b960fdc4b486ad77a736b..1cee253e3313ce913db1036c2799575c070de7cc 100644 (file)
--- 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;

diff --git a/bin/tests/system/forward/ns3/named.conf b/bin/tests/system/forward/ns3/named.conf
index 965032ec5750a6d1ab1e7bf05c0c065f2accf082..06ac32e9bb6fe0d17978d6b2dbb5bf50860ae25e 100644 (file)
--- 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;

diff --git a/bin/tests/system/forward/ns4/named.conf b/bin/tests/system/forward/ns4/named.conf
index 9d2b37ea3bd812bb4a95fd6eaaef01d41e0e0bbe..326cd12ddb8670c19a177ba4b2573565f8591a68 100644 (file)
--- 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;

diff --git a/bin/tests/system/glue/ns1/named.conf b/bin/tests/system/glue/ns1/named.conf
index ac2a3accfc76258a7c3c93eccbe736946cd264cb..5b51ba28d0458e72a6b4cab50be2c0a7d2320544 100644 (file)
--- 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;

diff --git a/bin/tests/system/limits/ns1/named.conf b/bin/tests/system/limits/ns1/named.conf
index 9b1f6c59388598e9765687352f628d84eedeb712..d4c97e424945cef85fdbf4f60cd5a63509b54dcd 100644 (file)
--- 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;

diff --git a/bin/tests/system/lwresd/lwresd1/lwresd.conf b/bin/tests/system/lwresd/lwresd1/lwresd.conf
index 991ba2741ca90ec1ddb0bf3468f7a5517336e694..c7bc5772d2fb7cd0771210a655b7415aadd1bd66 100644 (file)
--- 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;

diff --git a/bin/tests/system/lwresd/ns1/named.conf b/bin/tests/system/lwresd/ns1/named.conf
index f35a313c5af99b04698d1e82e7a6405314260a5f..d370d12b1423b4bc26624bbf79c85087b0dc7e02 100644 (file)
--- 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;

diff --git a/bin/tests/system/masterfile/ns1/named.conf b/bin/tests/system/masterfile/ns1/named.conf
index 6649034b1300f75c1f94ef75500dbfa1f0b80ec9..0069e4d10e488142f891d4bee48af5fbc3fded5a 100644 (file)
--- 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;

diff --git a/bin/tests/system/notify/ns1/named.conf b/bin/tests/system/notify/ns1/named.conf
index c84a1c995f7b91d8ad5bc1132877dfa0c3495c1b..787b28b0bb16006296ab68fa759cc8bf7976324c 100644 (file)
--- 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;

diff --git a/bin/tests/system/notify/ns2/named.conf b/bin/tests/system/notify/ns2/named.conf
index 169350709d37250123327b83241f7751d983dbad..4d97ebe9422f2045797a9ea3d906c9e6d0a318c2 100644 (file)
--- 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;

diff --git a/bin/tests/system/notify/ns3/named.conf b/bin/tests/system/notify/ns3/named.conf
index ac3cb43c370cd109731adebd131565bb75e7afa9..ef412f6d2b744788d6dcb90a20af6d5000a25a79 100644 (file)
--- 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;

diff --git a/bin/tests/system/nsupdate/ns1/named.conf b/bin/tests/system/nsupdate/ns1/named.conf
index 581ed445e96d9b7dfab4a4486173e1e0db9eba7a..9d81b6612838ffc0ec2135e31b472a7bcbcb95b8 100644 (file)
--- 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;

diff --git a/bin/tests/system/nsupdate/ns2/named.conf b/bin/tests/system/nsupdate/ns2/named.conf
index 09eb0794aede9ca04d6ff50ab4966ed74e663e2f..088a03cac07152eb8b29aeb3c122b6223e620e9d 100644 (file)
--- 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;

diff --git a/bin/tests/system/relay/ns1/named.conf b/bin/tests/system/relay/ns1/named.conf
index 93edd92957d3621eba5af4142ecac002000d3cc5..5407180def4d4e9d40cfb98b708b570ed6387588 100644 (file)
--- 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;

diff --git a/bin/tests/system/relay/ns2/named.conf b/bin/tests/system/relay/ns2/named.conf
index dc267066e90447ec88a0dcf115faa032526e150e..a14d5b39ae66a55fd761fc6901286dde8a32d162 100644 (file)
--- 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;

diff --git a/bin/tests/system/relay/ns3/named.conf b/bin/tests/system/relay/ns3/named.conf
index c550c6b033f0d6d17ed6f89870a8d573ccfa7640..0290482fbecdb27143b49853fbfd6c59f364d8d9 100644 (file)
--- 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;

diff --git a/bin/tests/system/relay/ns4/named.conf b/bin/tests/system/relay/ns4/named.conf
index 561aaf37ef9be85e3376e55a2d4d720ad320f02b..06884ed05c4b8e9173be58fe75ee857894364827 100644 (file)
--- 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;

diff --git a/bin/tests/system/resolver/ns1/named.conf b/bin/tests/system/resolver/ns1/named.conf
index 09c28ddf1b446b8229c6f308b9f168e714f5f708..5edaed8265cc1b71ee25a33979b42f37a2f29817 100644 (file)
--- 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;

diff --git a/bin/tests/system/sortlist/ns1/named.conf b/bin/tests/system/sortlist/ns1/named.conf
index de872b2ee25e21b1c8f4314f80ee457934b325d9..4397288513e0a413eed3ba845fd390fee308f978 100644 (file)
--- 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;

diff --git a/bin/tests/system/stress/ns1/named.conf b/bin/tests/system/stress/ns1/named.conf
index 38c2c1791e92715b1188cc280796c0ba27794e19..bf065ea5d51e3214b7e4a5896290fcbba6933afc 100644 (file)
--- 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;

diff --git a/bin/tests/system/stress/ns2/named.conf b/bin/tests/system/stress/ns2/named.conf
index 5b2c54c64187b6f4a8ba75654bb36919868fb037..64a59840eb6340e5c1566951101e4f61dd685f8b 100644 (file)
--- 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;

diff --git a/bin/tests/system/stress/ns3/named.conf b/bin/tests/system/stress/ns3/named.conf
index 2848240d16471fce1fc6b13edaaaa4daf7c02b51..656ef0af40ddc723857d1b5cdafd047ba2b7c07b 100644 (file)
--- 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;

diff --git a/bin/tests/system/stress/ns4/named.conf b/bin/tests/system/stress/ns4/named.conf
index b79d3b361f647a88d36c8ba2c48f41a85c9d97cf..d15f25c5abf9c04b19e565b890e93d06abe78cdc 100644 (file)
--- 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;

diff --git a/bin/tests/system/stub/ns1/named.conf b/bin/tests/system/stub/ns1/named.conf
index 1c8e486a8d7968df8cd0f15c67514a2698987534..9a052f2e272da012dbab50129c72a83a2cd7ca42 100644 (file)
--- 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;

diff --git a/bin/tests/system/stub/ns2/named.conf b/bin/tests/system/stub/ns2/named.conf
index 3f5d1bb8236253e462c91b860c1de88111023155..86f149d82284841de98e4ef0d82b73b8976d851a 100644 (file)
--- 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;

diff --git a/bin/tests/system/stub/ns3/named.conf b/bin/tests/system/stub/ns3/named.conf
index 36a7ec04a9c8b14bfa3054e9d6914b78bfff769a..baa15a99892a56f2a094c81c91d879aadd25b9ad 100644 (file)
--- 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;

diff --git a/bin/tests/system/tkey/ns1/named.conf.in b/bin/tests/system/tkey/ns1/named.conf.in
index 74dd56992f5c68543853581b7f3ebcf88bcaaa2b..af6b20cadce2423f02870479cf8fd89f831f8f0d 100644 (file)
--- 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;

diff --git a/bin/tests/system/unknown/ns1/named.conf b/bin/tests/system/unknown/ns1/named.conf
index 54c76a67d9001e31abf63948ab22fb9cb33ac928..d378bc558f0dfbcabbe5f00e7aca5a579f9cfc19 100644 (file)
--- 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;

diff --git a/bin/tests/system/upforwd/ns1/named.conf b/bin/tests/system/upforwd/ns1/named.conf
index e633604b873dcc37235bc558604aec3074da8b09..88b594a96e134ac550068408b5f051f8023225ea 100644 (file)
--- 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;

diff --git a/bin/tests/system/upforwd/ns2/named.conf b/bin/tests/system/upforwd/ns2/named.conf
index 065c6b47f6fdeb5d7c255606320b4aeb0164b745..859cd10d35298ba49d83c4290bc764c141e59d49 100644 (file)
--- 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;

diff --git a/bin/tests/system/upforwd/ns3/named.conf b/bin/tests/system/upforwd/ns3/named.conf
index 1396c181dd0b5c98404c06e9ba5fadd9750b58cf..1a0618a5a9e4bed22bfa5cfc6b0607c686791f48 100644 (file)
--- 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;

diff --git a/bin/tests/system/v6synth/ns1/named.conf b/bin/tests/system/v6synth/ns1/named.conf
index 5cb854fa0087a61d878f9658b2dc85da10a53d3f..368af71a197b70155f0e9edc544884ce2aeff7f6 100644 (file)
--- 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;

diff --git a/bin/tests/system/v6synth/ns2/named.conf b/bin/tests/system/v6synth/ns2/named.conf
index a4823e1cb3dc01d71af05db723ca9455b53f1cc5..014c99accc7a587323b75f26f50131b11f09fb72 100644 (file)
--- 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;

diff --git a/bin/tests/system/v6synth/ns3/named.conf b/bin/tests/system/v6synth/ns3/named.conf
index 095a758f68a27c1029f88a3499a98c27d02738eb..c2d21e823309b4a2c386b2165264b52607cff1d2 100644 (file)
--- 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;

diff --git a/bin/tests/system/views/ns1/named.conf b/bin/tests/system/views/ns1/named.conf
index 25223d860725359d3508a81fbe79407cf5f4c15d..446818e8896f6aa20d5c88ba7f1496ffcd746890 100644 (file)
--- 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;

diff --git a/bin/tests/system/views/ns2/named1.conf b/bin/tests/system/views/ns2/named1.conf
index 3b5a9246f3bcae1e40915ddd2b468079b55be6b8..24d11e907388c8c783f66136c6ebd90140aa6a45 100644 (file)
--- 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;

diff --git a/bin/tests/system/views/ns2/named2.conf b/bin/tests/system/views/ns2/named2.conf
index 509bddc3149c85b154a37ddc44335c89cac9e5b6..7e344ec7d4a5ca8335d1ce73d0fd8df231b77423 100644 (file)
--- 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;

diff --git a/bin/tests/system/views/ns3/named1.conf b/bin/tests/system/views/ns3/named1.conf
index 5c5e6b063a5ed39e83804976693982bf2a4bdb81..723d526fe9ea400cb97df9c592b94bde93ff9a43 100644 (file)
--- 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;

diff --git a/bin/tests/system/views/ns3/named2.conf b/bin/tests/system/views/ns3/named2.conf
index e9a92bdc4579c8995f4e3a997c3477ac712ae2c7..5ff4427e06b0d1d4edec360276718dfb672cfdfe 100644 (file)
--- 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;

diff --git a/bin/tests/system/xfer/ns1/named.conf b/bin/tests/system/xfer/ns1/named.conf
index 752c38d9347d626c97d7609898257614cdef68a4..db134ee3e3d1136e4f40dad9b36c04fb8bf2b9a6 100644 (file)
--- 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;

diff --git a/bin/tests/system/xfer/ns2/named.conf b/bin/tests/system/xfer/ns2/named.conf
index cfd877e88f99a8df2e6fdea7918150aefc2d44fc..5a58c3860813069dd57b39af7dc10b6411b589c5 100644 (file)
--- 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;

diff --git a/bin/tests/system/xfer/ns3/named.conf b/bin/tests/system/xfer/ns3/named.conf
index 1107f1dbb2e02554d0813f2736ff6a4fb7327e53..cc719c553265bb203c2acf74189f32ea47a5be2c 100644 (file)
--- 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;

diff --git a/bin/tests/system/xferquota/ns1/named.conf b/bin/tests/system/xferquota/ns1/named.conf
index 842a4998c6c7781d314defb9b19e3c6c850ee3c3..a418d46d174057ff5f9bda9b9e180e482b943e09 100644 (file)
--- 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;

diff --git a/bin/tests/system/xferquota/ns2/named.conf b/bin/tests/system/xferquota/ns2/named.conf
index 07858f910a3fece384da04488e0ddf2ac96f49cc..2796791fd15a7922a76f5a9c348cb432740d6cf1 100644 (file)
--- 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;

diff --git a/lib/dns/rdata/in_1/srv_33.c b/lib/dns/rdata/in_1/srv_33.c
index e19d3cda74a54726d8543f46218c0a993729b198..8a4782beb19248b1e6524558494031adaa6f2c04 100644 (file)
--- 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);