From: Diego Fronza Date: Tue, 22 Oct 2019 15:10:37 +0000 (-0300) Subject: Cleaned up configuration files, removed unused directives and commented lines. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c98d4625bb3c452c82f9a1084e2802981a04d5db;p=thirdparty%2Fbind9.git 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 fe9837a7a28..c0b60829f93 100644 --- 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 746a2415b83..b7af8784445 100644 --- 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 190264bf1df..5386f975235 100644 --- 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 c7836be37b5..17e932f5667 100644 --- 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 fe903bc0c96..8dcae426cf5 100644 --- 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 4a08fa7cecc..dc46098952f 100644 --- 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 4bbd56eea75..bb995b64f02 100644 --- 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; }; };