Cleaned up configuration files, removed unused directives and commented lines.

diff --git a/bin/tests/system/include-multiplecfg/ns2/mars.com.db b/bin/tests/system/include-multiplecfg/ns2/mars.com.db
index fe9837a7a28132e6c1ce966a6d45e1b6e466de09..c0b60829f93fe29cfbead0c5a19124332dca2492 100644 (file)
--- a/bin/tests/system/include-multiplecfg/ns2/mars.com.db
+++ b/bin/tests/system/include-multiplecfg/ns2/mars.com.db
@@ -7,15 +7,7 @@ $TTL 86400
                     86400 )    ; minimum TTL of 1 day
 
       IN     NS     dns1.mars.com.
-      IN     NS     dns2.mars.com.
-
-      IN     MX     10     mail1.mars.com.
-      IN     MX     20     mail2.mars.com.
 
              IN     A       10.53.0.1
 
 dns1         IN     A       10.53.0.1
-dns2         IN     A       10.53.0.2
-
-mail1        IN     A       10.53.0.1
-mail2        IN     A       10.53.0.2

diff --git a/bin/tests/system/include-multiplecfg/ns2/mars.conf b/bin/tests/system/include-multiplecfg/ns2/mars.conf
index 746a2415b835dd3cbb9d704455100888e7815b21..b7af8784445afcf449458a73b61b783b3b9b518e 100644 (file)
--- a/bin/tests/system/include-multiplecfg/ns2/mars.conf
+++ b/bin/tests/system/include-multiplecfg/ns2/mars.conf
@@ -2,7 +2,5 @@
 zone "mars.com" {
         type master;
         file "mars.com.db";
-        allow-transfer { any; };
-        allow-update { any; };
 };
 

diff --git a/bin/tests/system/include-multiplecfg/ns2/named.conf.in b/bin/tests/system/include-multiplecfg/ns2/named.conf.in
index 190264bf1dfd57c1c098d699e49292c034508494..5386f975235e97990c7c9d279f23ada1b350f651 100644 (file)
--- a/bin/tests/system/include-multiplecfg/ns2/named.conf.in
+++ b/bin/tests/system/include-multiplecfg/ns2/named.conf.in
@@ -18,11 +18,6 @@ options {
         notify no;
 };
 
-#zone "." {
-#        type hint;
-#        file "../../common/root.hint";
-#};
-
 # Should include all files matching pattern.
 include "zone*.conf";
 

diff --git a/bin/tests/system/include-multiplecfg/ns2/zone1.com.db b/bin/tests/system/include-multiplecfg/ns2/zone1.com.db
index c7836be37b598761546f281df5a70024c7b07dad..17e932f5667c113abadc8c00865081574ef6af2c 100644 (file)
--- a/bin/tests/system/include-multiplecfg/ns2/zone1.com.db
+++ b/bin/tests/system/include-multiplecfg/ns2/zone1.com.db
@@ -7,15 +7,7 @@ $TTL 86400
                     86400 )    ; minimum TTL of 1 day
 
       IN     NS     dns1.zone1.com.
-      IN     NS     dns2.zone1.com.
-
-      IN     MX     10     mail1.zone1.com.
-      IN     MX     20     mail2.zone1.com.
 
              IN     A       10.53.0.1
 
 dns1         IN     A       10.53.0.1
-dns2         IN     A       10.53.0.2
-
-mail1        IN     A       10.53.0.1
-mail2        IN     A       10.53.0.2

diff --git a/bin/tests/system/include-multiplecfg/ns2/zone1.conf b/bin/tests/system/include-multiplecfg/ns2/zone1.conf
index fe903bc0c96fcc9d058be4d9ee86fd13d0c83e94..8dcae426cf5139c2d16c39c2da6b28204ca5030d 100644 (file)
--- a/bin/tests/system/include-multiplecfg/ns2/zone1.conf
+++ b/bin/tests/system/include-multiplecfg/ns2/zone1.conf
@@ -2,7 +2,5 @@
 zone "zone1.com" {
         type master;
         file "zone1.com.db";
-        allow-transfer { any; };
-        allow-update { any; };
 };
 

diff --git a/bin/tests/system/include-multiplecfg/ns2/zone2.com.db b/bin/tests/system/include-multiplecfg/ns2/zone2.com.db
index 4a08fa7cecc0767b27907c210b681ec7276fd311..dc46098952fcd8a43949cbdd9400f6e3ea2cbffc 100644 (file)
--- a/bin/tests/system/include-multiplecfg/ns2/zone2.com.db
+++ b/bin/tests/system/include-multiplecfg/ns2/zone2.com.db
@@ -7,15 +7,7 @@ $TTL 86400
                     86400 )    ; minimum TTL of 1 day
 
       IN     NS     dns1.zone2.com.
-      IN     NS     dns2.zone2.com.
-
-      IN     MX     10     mail1.zone2.com.
-      IN     MX     20     mail2.zone2.com.
 
              IN     A       10.53.0.1
 
 dns1         IN     A       10.53.0.1
-dns2         IN     A       10.53.0.2
-
-mail1        IN     A       10.53.0.1
-mail2        IN     A       10.53.0.2

diff --git a/bin/tests/system/include-multiplecfg/ns2/zone2.conf b/bin/tests/system/include-multiplecfg/ns2/zone2.conf
index 4bbd56eea7518da359ec1e84671a80d1f4bf42a5..bb995b64f02b38cc32ed034c17460fd69f8ad0bb 100644 (file)
--- a/bin/tests/system/include-multiplecfg/ns2/zone2.conf
+++ b/bin/tests/system/include-multiplecfg/ns2/zone2.conf
@@ -2,7 +2,5 @@
 zone "zone2.com" {
         type master;
         file "zone2.com.db";
-        allow-transfer { any; };
-        allow-update { any; };
 };