From: Evan Hunt Date: Wed, 16 May 2018 18:51:06 +0000 (-0700) Subject: update system tests so validation won't fail when using IANA key X-Git-Tag: v9.13.1~19^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a7a2fa296a7a9563c69a78de0208c4db3827201c;p=thirdparty%2Fbind9.git update system tests so validation won't fail when using IANA key - all tests with "recursion yes" now also specify "dnssec-validation yes", and all tests with "recursion no" also specify "dnssec-validation no". this must be maintained in all new tests, or else validation will fail when we use local root zones for testing. - clean.sh has been modified where necessary to remove managed-keys.bind and viewname.mkeys files. --- diff --git a/bin/tests/system/acl/clean.sh b/bin/tests/system/acl/clean.sh index 75acebacaee..080776a2adb 100644 --- a/bin/tests/system/acl/clean.sh +++ b/bin/tests/system/acl/clean.sh @@ -21,3 +21,4 @@ rm -f */named.run rm -f ns*/named.lock rm -f ns*/_default.nzf rm -f ns*/_default.nzd* +rm -f ns*/managed-keys.bind* ns*/*.mkeys* diff --git a/bin/tests/system/additional/clean.sh b/bin/tests/system/additional/clean.sh index 03e55cd3331..eac8eb3f8ce 100644 --- a/bin/tests/system/additional/clean.sh +++ b/bin/tests/system/additional/clean.sh @@ -18,3 +18,4 @@ rm -f */named.memstats rm -f */named.conf rm -f */named.run rm -f ns*/named.lock +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/additional/ns1/named1.conf.in b/bin/tests/system/additional/ns1/named1.conf.in index 3ab05a3458a..1fb8e7a6017 100644 --- a/bin/tests/system/additional/ns1/named1.conf.in +++ b/bin/tests/system/additional/ns1/named1.conf.in @@ -14,6 +14,7 @@ options { notify-source 10.53.0.1; transfer-source 10.53.0.1; recursion no; + dnssec-validation no; port @PORT@; pid-file "named.pid"; listen-on { 10.53.0.1; }; diff --git a/bin/tests/system/additional/ns1/named2.conf.in b/bin/tests/system/additional/ns1/named2.conf.in index 5b053d841ad..84a55481e7c 100644 --- a/bin/tests/system/additional/ns1/named2.conf.in +++ b/bin/tests/system/additional/ns1/named2.conf.in @@ -14,6 +14,7 @@ options { notify-source 10.53.0.1; transfer-source 10.53.0.1; recursion no; + dnssec-validation no; port @PORT@; pid-file "named.pid"; listen-on { 10.53.0.1; }; diff --git a/bin/tests/system/additional/ns1/named3.conf.in b/bin/tests/system/additional/ns1/named3.conf.in index 7c2e05c42ee..c0b697986a4 100644 --- a/bin/tests/system/additional/ns1/named3.conf.in +++ b/bin/tests/system/additional/ns1/named3.conf.in @@ -14,6 +14,7 @@ options { notify-source 10.53.0.1; transfer-source 10.53.0.1; recursion no; + dnssec-validation no; port @PORT@; pid-file "named.pid"; listen-on { 10.53.0.1; }; diff --git a/bin/tests/system/additional/ns1/named4.conf.in b/bin/tests/system/additional/ns1/named4.conf.in index 7ba958aca5e..a8f0aa4beb0 100644 --- a/bin/tests/system/additional/ns1/named4.conf.in +++ b/bin/tests/system/additional/ns1/named4.conf.in @@ -14,6 +14,7 @@ options { notify-source 10.53.0.1; transfer-source 10.53.0.1; recursion no; + dnssec-validation no; port @PORT@; pid-file "named.pid"; listen-on { 10.53.0.1; }; diff --git a/bin/tests/system/additional/ns3/named.conf.in b/bin/tests/system/additional/ns3/named.conf.in index f01bd47b737..bd730ae418c 100644 --- a/bin/tests/system/additional/ns3/named.conf.in +++ b/bin/tests/system/additional/ns3/named.conf.in @@ -20,6 +20,7 @@ options { listen-on { 10.53.0.3; }; listen-on-v6 { none; }; recursion yes; + dnssec-validation yes; }; zone "." { diff --git a/bin/tests/system/addzone/clean.sh b/bin/tests/system/addzone/clean.sh index 40f9609023b..30c349c8301 100644 --- a/bin/tests/system/addzone/clean.sh +++ b/bin/tests/system/addzone/clean.sh @@ -37,3 +37,4 @@ rm -f ns1/redirect.db rm -f ns2/redirect.db rm -f ns2/redirect.bk rm -f ns3/redirect.db +rm -f ns*/managed-keys.bind* ns*/*.mkeys* diff --git a/bin/tests/system/allow-query/clean.sh b/bin/tests/system/allow-query/clean.sh index a36dbf6923f..17ec1a815f1 100644 --- a/bin/tests/system/allow-query/clean.sh +++ b/bin/tests/system/allow-query/clean.sh @@ -18,3 +18,4 @@ rm -f ns2/named.conf ns2/controls.conf rm -f */named.memstats rm -f ns*/named.lock rm -f ns*/named.run ns*/named.run.prev +rm -f ns*/managed-keys.bind* ns*/*.mkeys* diff --git a/bin/tests/system/auth/clean.sh b/bin/tests/system/auth/clean.sh index f18041d5f43..a3efd21a4b3 100644 --- a/bin/tests/system/auth/clean.sh +++ b/bin/tests/system/auth/clean.sh @@ -13,3 +13,4 @@ rm -f */named.conf rm -f dig.out.test* rm -f ns2/example.com.bk rm -f ns2/example.net.bk +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/autosign/clean.sh b/bin/tests/system/autosign/clean.sh index f5b2d602058..91879592b21 100644 --- a/bin/tests/system/autosign/clean.sh +++ b/bin/tests/system/autosign/clean.sh @@ -63,3 +63,4 @@ rm -f nsupdate.out rm -f settime.out.* rm -f signing.out.* rm -f sync.key +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/builtin/clean.sh b/bin/tests/system/builtin/clean.sh index 93a11156b6a..c15da7614c5 100644 --- a/bin/tests/system/builtin/clean.sh +++ b/bin/tests/system/builtin/clean.sh @@ -15,3 +15,4 @@ rm -f ns?/named.conf rm -f rndc.status.ns* rm -f dig.out.ns* rm -f ns*/named.lock +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/cacheclean/clean.sh b/bin/tests/system/cacheclean/clean.sh index 174179c1a05..4cd319179e8 100644 --- a/bin/tests/system/cacheclean/clean.sh +++ b/bin/tests/system/cacheclean/clean.sh @@ -21,3 +21,4 @@ rm -f */named.run rm -f */named.conf rm -f ns2/named_dump.db.* rm -f ns*/named.lock +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/cacheclean/ns1/named.conf.in b/bin/tests/system/cacheclean/ns1/named.conf.in index 35c080115f8..c1ce07e0717 100644 --- a/bin/tests/system/cacheclean/ns1/named.conf.in +++ b/bin/tests/system/cacheclean/ns1/named.conf.in @@ -18,6 +18,7 @@ options { listen-on { 10.53.0.1; }; listen-on-v6 { none; }; recursion no; + dnssec-validation no; notify yes; check-integrity no; minimal-responses no; diff --git a/bin/tests/system/cacheclean/ns2/named.conf.in b/bin/tests/system/cacheclean/ns2/named.conf.in index c3c42609776..4fd5328e865 100644 --- a/bin/tests/system/cacheclean/ns2/named.conf.in +++ b/bin/tests/system/cacheclean/ns2/named.conf.in @@ -20,6 +20,8 @@ options { notify yes; max-cache-size 80%; disable-empty-zone 127.IN-ADDR.ARPA; + recursion yes; + dnssec-validation yes; }; key rndc_key { diff --git a/bin/tests/system/case/clean.sh b/bin/tests/system/case/clean.sh index 646f3f6c169..9af9aadaf69 100644 --- a/bin/tests/system/case/clean.sh +++ b/bin/tests/system/case/clean.sh @@ -19,3 +19,4 @@ rm -f ns1/dynamic.db.jnl rm -f ns2/dynamic.bk rm -f ns2/dynamic.bk.jnl rm -f ns2/example.bk +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/catz/clean.sh b/bin/tests/system/catz/clean.sh index 4f90bf7ccf4..7c1c1bd89c7 100644 --- a/bin/tests/system/catz/clean.sh +++ b/bin/tests/system/catz/clean.sh @@ -22,3 +22,4 @@ rm -f nsupdate.out.* rm -f ns[123]/catalog[1234].example.db rm -rf ns2/zonedir rm -f ns*/*.nzd ns*/*.nzd-lock +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/chain/clean.sh b/bin/tests/system/chain/clean.sh index 265123f0c6a..4d0b6d2eaf8 100755 --- a/bin/tests/system/chain/clean.sh +++ b/bin/tests/system/chain/clean.sh @@ -13,3 +13,4 @@ rm -f dig.out.* named*.pid rm -f ns*/named.conf rm -f */named.memstats */named.recursing */named.lock */named.run */ans.run rm -f ns2/K* ns2/dsset-* ns2/example.db.signed +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/chain/ns1/named.conf.in b/bin/tests/system/chain/ns1/named.conf.in index 5815c3c756c..d55fb0d2ebf 100644 --- a/bin/tests/system/chain/ns1/named.conf.in +++ b/bin/tests/system/chain/ns1/named.conf.in @@ -18,8 +18,8 @@ options { listen-on { 10.53.0.1; }; listen-on-v6 { none; }; recursion no; + dnssec-validation yes; notify yes; - dnssec-enable yes; }; zone "." { type master; file "root.db"; }; diff --git a/bin/tests/system/chain/ns2/named.conf.in b/bin/tests/system/chain/ns2/named.conf.in index 519bfb3494e..024424fb859 100644 --- a/bin/tests/system/chain/ns2/named.conf.in +++ b/bin/tests/system/chain/ns2/named.conf.in @@ -20,6 +20,7 @@ options { listen-on { 10.53.0.2; }; listen-on-v6 { none; }; recursion no; + dnssec-validation no; notify yes; }; diff --git a/bin/tests/system/chain/ns5/named.conf.in b/bin/tests/system/chain/ns5/named.conf.in index d6813b6f695..14a05983bc5 100644 --- a/bin/tests/system/chain/ns5/named.conf.in +++ b/bin/tests/system/chain/ns5/named.conf.in @@ -20,6 +20,7 @@ options { listen-on { 10.53.0.5; }; listen-on-v6 { none; }; recursion no; + dnssec-validation no; notify yes; }; diff --git a/bin/tests/system/chain/ns7/named.conf.in b/bin/tests/system/chain/ns7/named.conf.in index 21f5a998c5f..defabb0a69f 100644 --- a/bin/tests/system/chain/ns7/named.conf.in +++ b/bin/tests/system/chain/ns7/named.conf.in @@ -20,6 +20,7 @@ options { listen-on-v6 { fd92:7065:b8e:ffff::7; }; recursion yes; allow-recursion { any; }; + dnssec-validation yes; }; key rndc_key { diff --git a/bin/tests/system/checknames/clean.sh b/bin/tests/system/checknames/clean.sh index 83073f9e6e0..c5232d7e52d 100644 --- a/bin/tests/system/checknames/clean.sh +++ b/bin/tests/system/checknames/clean.sh @@ -20,3 +20,4 @@ rm -f ns4/*.update.db.jnl rm -f */named.memstats rm -f */named.run rm -f ns*/named.lock +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/checknames/ns1/named.conf.in b/bin/tests/system/checknames/ns1/named.conf.in index 99b8004eb42..4a557a15a8a 100644 --- a/bin/tests/system/checknames/ns1/named.conf.in +++ b/bin/tests/system/checknames/ns1/named.conf.in @@ -18,6 +18,7 @@ options { listen-on { 10.53.0.1; }; listen-on-v6 { none; }; recursion no; + dnssec-validation no; notify yes; check-integrity no; }; diff --git a/bin/tests/system/checknames/ns2/named.conf.in b/bin/tests/system/checknames/ns2/named.conf.in index ed625e53e55..84699440c8b 100644 --- a/bin/tests/system/checknames/ns2/named.conf.in +++ b/bin/tests/system/checknames/ns2/named.conf.in @@ -18,6 +18,7 @@ options { listen-on { 10.53.0.2; }; listen-on-v6 { none; }; recursion yes; + dnssec-validation yes; check-names response warn; notify yes; }; diff --git a/bin/tests/system/checknames/ns3/named.conf.in b/bin/tests/system/checknames/ns3/named.conf.in index 5e6034f0033..00c6836d50f 100644 --- a/bin/tests/system/checknames/ns3/named.conf.in +++ b/bin/tests/system/checknames/ns3/named.conf.in @@ -18,6 +18,7 @@ options { listen-on { 10.53.0.3; }; listen-on-v6 { none; }; recursion yes; + dnssec-validation yes; check-names response fail; notify yes; }; diff --git a/bin/tests/system/checknames/ns4/named.conf.in b/bin/tests/system/checknames/ns4/named.conf.in index f37d543899b..d4065cafab6 100644 --- a/bin/tests/system/checknames/ns4/named.conf.in +++ b/bin/tests/system/checknames/ns4/named.conf.in @@ -18,6 +18,7 @@ options { listen-on { 10.53.0.4; }; listen-on-v6 { none; }; recursion yes; + dnssec-validation yes; check-names master ignore; notify yes; }; diff --git a/bin/tests/system/cookie/clean.sh b/bin/tests/system/cookie/clean.sh index 01abbc8f6a6..b5888d1f5b0 100644 --- a/bin/tests/system/cookie/clean.sh +++ b/bin/tests/system/cookie/clean.sh @@ -13,3 +13,4 @@ rm -f ns1/named_dump.db rm -f ns*/named.memstats rm -f ns*/named.run rm -f ns*/named.lock +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/cookie/ns1/named.conf.in b/bin/tests/system/cookie/ns1/named.conf.in index a924e6bc4c7..4d23c0eaad0 100644 --- a/bin/tests/system/cookie/ns1/named.conf.in +++ b/bin/tests/system/cookie/ns1/named.conf.in @@ -27,6 +27,7 @@ options { listen-on { 10.53.0.1; }; listen-on-v6 { none; }; recursion yes; + dnssec-validation yes; deny-answer-addresses { 192.0.2.0/24; 2001:db8:beef::/48; } except-from { "example.org"; }; deny-answer-aliases { "example.org"; } diff --git a/bin/tests/system/cookie/ns2/named.conf.in b/bin/tests/system/cookie/ns2/named.conf.in index 99fb6d26609..23425ccbdc4 100644 --- a/bin/tests/system/cookie/ns2/named.conf.in +++ b/bin/tests/system/cookie/ns2/named.conf.in @@ -18,6 +18,7 @@ options { listen-on { 10.53.0.2; }; listen-on-v6 { none; }; recursion no; + dnssec-validation no; send-cookie yes; nocookie-udp-size 512; }; diff --git a/bin/tests/system/cookie/ns3/named.conf.in b/bin/tests/system/cookie/ns3/named.conf.in index 93f0ae1209c..47fd6bafc27 100644 --- a/bin/tests/system/cookie/ns3/named.conf.in +++ b/bin/tests/system/cookie/ns3/named.conf.in @@ -27,6 +27,7 @@ options { listen-on { 10.53.0.3; }; listen-on-v6 { none; }; recursion yes; + dnssec-validation yes; deny-answer-addresses { 192.0.2.0/24; 2001:db8:beef::/48; } except-from { "example.org"; }; deny-answer-aliases { "example.org"; } diff --git a/bin/tests/system/cookie/ns4/named.conf.in b/bin/tests/system/cookie/ns4/named.conf.in index cd7c07f23c1..79d1cda568c 100644 --- a/bin/tests/system/cookie/ns4/named.conf.in +++ b/bin/tests/system/cookie/ns4/named.conf.in @@ -27,6 +27,7 @@ options { listen-on { 10.53.0.4; }; listen-on-v6 { none; }; recursion yes; + dnssec-validation yes; cookie-algorithm sha1; cookie-secret "569d36a6cc27d6bf55502183302ba352745255a2"; require-server-cookie yes; diff --git a/bin/tests/system/cookie/ns5/named.conf.in b/bin/tests/system/cookie/ns5/named.conf.in index 0d050a62eab..ae51a9071d7 100644 --- a/bin/tests/system/cookie/ns5/named.conf.in +++ b/bin/tests/system/cookie/ns5/named.conf.in @@ -27,6 +27,7 @@ options { listen-on { 10.53.0.5; }; listen-on-v6 { none; }; recursion yes; + dnssec-validation yes; cookie-algorithm sha1; cookie-secret "569d36a6cc27d6bf55502183302ba352745255a2"; cookie-secret "6b300e27a0db46d4b046e4189790fa7db3c1ffb3"; diff --git a/bin/tests/system/cookie/ns6/named.conf.in b/bin/tests/system/cookie/ns6/named.conf.in index 634a939bd94..368d9a31927 100644 --- a/bin/tests/system/cookie/ns6/named.conf.in +++ b/bin/tests/system/cookie/ns6/named.conf.in @@ -27,6 +27,7 @@ options { listen-on { 10.53.0.6; }; listen-on-v6 { none; }; recursion yes; + dnssec-validation yes; cookie-algorithm sha1; cookie-secret "6b300e27a0db46d4b046e4189790fa7db3c1ffb3"; require-server-cookie yes; diff --git a/bin/tests/system/database/clean.sh b/bin/tests/system/database/clean.sh index 5a08ae0c744..3d407145673 100644 --- a/bin/tests/system/database/clean.sh +++ b/bin/tests/system/database/clean.sh @@ -12,3 +12,4 @@ rm -f ns1/named.conf ns1/named.run ns1/named.memstats rm -f dig.out.* rm -f ns*/named.lock +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/delzone/clean.sh b/bin/tests/system/delzone/clean.sh index 9a1c79fd7f5..51b9e3d1441 100644 --- a/bin/tests/system/delzone/clean.sh +++ b/bin/tests/system/delzone/clean.sh @@ -20,3 +20,4 @@ rm -f ns2/inline.db.signed rm -f ns2/inlineslave.bk* rm -f ns*/named.lock rm -f ns2/nzf-* +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/delzone/ns1/named.conf b/bin/tests/system/delzone/ns1/named.conf index 8b6c4415ad8..71cd514d3a8 100644 --- a/bin/tests/system/delzone/ns1/named.conf +++ b/bin/tests/system/delzone/ns1/named.conf @@ -18,6 +18,7 @@ options { listen-on-v6 { none; }; allow-query { any; }; recursion no; + dnssec-validation no; }; zone "." { diff --git a/bin/tests/system/delzone/ns2/named.conf b/bin/tests/system/delzone/ns2/named.conf index 8532e500df6..708754c3844 100644 --- a/bin/tests/system/delzone/ns2/named.conf +++ b/bin/tests/system/delzone/ns2/named.conf @@ -16,6 +16,7 @@ options { listen-on-v6 { none; }; allow-query { any; }; recursion no; + dnssec-validation no; allow-new-zones yes; }; diff --git a/bin/tests/system/dialup/ns1/named.conf b/bin/tests/system/dialup/ns1/named.conf index d184cd824ac..9811b7f4322 100644 --- a/bin/tests/system/dialup/ns1/named.conf +++ b/bin/tests/system/dialup/ns1/named.conf @@ -21,6 +21,7 @@ options { listen-on-v6 { none; }; heartbeat-interval 2; recursion no; + dnssec-validation no; }; zone "." { diff --git a/bin/tests/system/dialup/ns2/named.conf b/bin/tests/system/dialup/ns2/named.conf index a71d685b459..fdf06029e7d 100644 --- a/bin/tests/system/dialup/ns2/named.conf +++ b/bin/tests/system/dialup/ns2/named.conf @@ -21,6 +21,7 @@ options { listen-on-v6 { none; }; heartbeat-interval 2; recursion no; + dnssec-validation no; }; zone "." { diff --git a/bin/tests/system/dialup/ns3/named.conf b/bin/tests/system/dialup/ns3/named.conf index 7a7b42470f1..864b026b0cc 100644 --- a/bin/tests/system/dialup/ns3/named.conf +++ b/bin/tests/system/dialup/ns3/named.conf @@ -21,6 +21,7 @@ options { listen-on-v6 { none; }; heartbeat-interval 2; recursion no; + dnssec-validation no; }; zone "." { diff --git a/bin/tests/system/digdelv/clean.sh b/bin/tests/system/digdelv/clean.sh index dfc6f7c1986..04c65ad46be 100644 --- a/bin/tests/system/digdelv/clean.sh +++ b/bin/tests/system/digdelv/clean.sh @@ -19,3 +19,4 @@ rm -f dig.out.mn.* rm -f dig.out.nm.* rm -f dig.out.nn.* rm -f ns*/named.lock +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/dlv/clean.sh b/bin/tests/system/dlv/clean.sh index 94cadc69aed..7cc08433d91 100644 --- a/bin/tests/system/dlv/clean.sh +++ b/bin/tests/system/dlv/clean.sh @@ -40,3 +40,4 @@ rm -f ns6/signer.err rm -f */named.memstats rm -f dig.out.ns*.test* rm -f ns*/named.lock +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/dlz/clean.sh b/bin/tests/system/dlz/clean.sh index e38b806ceae..fe338a41448 100644 --- a/bin/tests/system/dlz/clean.sh +++ b/bin/tests/system/dlz/clean.sh @@ -14,3 +14,4 @@ rm -f dig.out.* rm -f */named.memstats rm -f */named.run rm -f ns*/named.lock +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/dlzexternal/clean.sh b/bin/tests/system/dlzexternal/clean.sh index 3e6cb9efc96..dde397680b8 100644 --- a/bin/tests/system/dlzexternal/clean.sh +++ b/bin/tests/system/dlzexternal/clean.sh @@ -21,3 +21,4 @@ rm -f ns1/ddns.key rm -f dig.out* rm -f ns*/named.lock rm -f ns1/session.key +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/dns64/clean.sh b/bin/tests/system/dns64/clean.sh index fdb0053d9fe..8af092d2787 100644 --- a/bin/tests/system/dns64/clean.sh +++ b/bin/tests/system/dns64/clean.sh @@ -17,3 +17,4 @@ rm -f */named.memstats rm -f */named.run rm -f dig.out.* rm -f ns*/named.lock +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/dnssec/clean.sh b/bin/tests/system/dnssec/clean.sh index a8b2ae12f25..2279e6828c5 100644 --- a/bin/tests/system/dnssec/clean.sh +++ b/bin/tests/system/dnssec/clean.sh @@ -97,3 +97,4 @@ rm -f signer/general/signer.out.* rm -f signer/general/dsset* rm -f signing.out* rm -f python.out.* +rm -f ns*/managed-keys.bind* ns*/*.mkeys* diff --git a/bin/tests/system/dnstap/clean.sh b/bin/tests/system/dnstap/clean.sh index fe934024302..699916985cd 100644 --- a/bin/tests/system/dnstap/clean.sh +++ b/bin/tests/system/dnstap/clean.sh @@ -22,3 +22,4 @@ rm -f ns*/dnstap.out.save rm -f ns*/dnstap.out.save.? rm -f ns*/named.lock rm -f ydump.out +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/dscp/clean.sh b/bin/tests/system/dscp/clean.sh index b29303a6a0b..cea3269ae2d 100644 --- a/bin/tests/system/dscp/clean.sh +++ b/bin/tests/system/dscp/clean.sh @@ -13,3 +13,4 @@ rm -f */named.memstats rm -f */named.run rm -f */named.conf rm -f ns*/named.lock +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/dscp/ns1/named.conf.in b/bin/tests/system/dscp/ns1/named.conf.in index a6e8b410654..39ca4eebfb1 100644 --- a/bin/tests/system/dscp/ns1/named.conf.in +++ b/bin/tests/system/dscp/ns1/named.conf.in @@ -19,6 +19,7 @@ options { listen-on { 10.53.0.1; }; listen-on-v6 { none; }; recursion no; + dnssec-validation no; notify yes; }; diff --git a/bin/tests/system/dscp/ns2/named.conf.in b/bin/tests/system/dscp/ns2/named.conf.in index 6419a019ab3..4edc7e7ddba 100644 --- a/bin/tests/system/dscp/ns2/named.conf.in +++ b/bin/tests/system/dscp/ns2/named.conf.in @@ -19,6 +19,7 @@ options { listen-on { 10.53.0.2; }; listen-on-v6 { none; }; recursion no; + dnssec-validation no; notify yes; }; diff --git a/bin/tests/system/dscp/ns3/named.conf.in b/bin/tests/system/dscp/ns3/named.conf.in index 71d72cd5c2a..c775e5180b3 100644 --- a/bin/tests/system/dscp/ns3/named.conf.in +++ b/bin/tests/system/dscp/ns3/named.conf.in @@ -19,6 +19,8 @@ options { listen-on { 10.53.0.3; }; listen-on-v6 { none; }; notify yes; + recursion yes; + dnssec-validation yes; }; zone "." { diff --git a/bin/tests/system/dscp/ns4/named.conf.in b/bin/tests/system/dscp/ns4/named.conf.in index 70dd5e5ee8b..df13caa77bc 100644 --- a/bin/tests/system/dscp/ns4/named.conf.in +++ b/bin/tests/system/dscp/ns4/named.conf.in @@ -19,6 +19,7 @@ options { listen-on dscp 46 { 10.53.0.4; }; listen-on-v6 { none; }; recursion no; + dnssec-validation no; notify yes; }; diff --git a/bin/tests/system/dscp/ns5/named.conf.in b/bin/tests/system/dscp/ns5/named.conf.in index e2726c3d467..dc2bb6089ed 100644 --- a/bin/tests/system/dscp/ns5/named.conf.in +++ b/bin/tests/system/dscp/ns5/named.conf.in @@ -20,6 +20,7 @@ options { listen-on dscp 46 { 10.53.0.5; }; listen-on-v6 { none; }; recursion no; + dnssec-validation no; notify yes; }; diff --git a/bin/tests/system/dscp/ns6/named.conf.in b/bin/tests/system/dscp/ns6/named.conf.in index eedbab1315a..1714e2232a7 100644 --- a/bin/tests/system/dscp/ns6/named.conf.in +++ b/bin/tests/system/dscp/ns6/named.conf.in @@ -19,6 +19,8 @@ options { listen-on dscp 46 { 10.53.0.6; }; listen-on-v6 { none; }; notify yes; + recursion yes; + dnssec-validation yes; }; zone "." { diff --git a/bin/tests/system/dscp/ns7/named.conf.in b/bin/tests/system/dscp/ns7/named.conf.in index e7c9528df10..25ed20ac634 100644 --- a/bin/tests/system/dscp/ns7/named.conf.in +++ b/bin/tests/system/dscp/ns7/named.conf.in @@ -20,6 +20,7 @@ options { listen-on dscp 46 { 10.53.0.7; }; listen-on-v6 { none; }; recursion no; + dnssec-validation no; notify yes; }; diff --git a/bin/tests/system/dsdigest/clean.sh b/bin/tests/system/dsdigest/clean.sh index bb40bcb82c5..a4f2b67b565 100644 --- a/bin/tests/system/dsdigest/clean.sh +++ b/bin/tests/system/dsdigest/clean.sh @@ -19,3 +19,4 @@ rm -f */named.conf rm -f */named.run rm -f */named.memstats rm -f ns*/named.lock +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/dyndb/clean.sh b/bin/tests/system/dyndb/clean.sh index 63449472040..ae91e3318ca 100644 --- a/bin/tests/system/dyndb/clean.sh +++ b/bin/tests/system/dyndb/clean.sh @@ -20,3 +20,4 @@ rm -f added.a.out.* rm -f added.ptr.out.* rm -f deleted.a.out.* rm -f deleted.ptr.out.* +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/ecdsa/clean.sh b/bin/tests/system/ecdsa/clean.sh index 3779676eea4..6cfeec24663 100644 --- a/bin/tests/system/ecdsa/clean.sh +++ b/bin/tests/system/ecdsa/clean.sh @@ -16,3 +16,4 @@ rm -f dig.out* rm -f */named.run rm -f */named.memstats rm -f ns*/named.lock +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/eddsa/clean.sh b/bin/tests/system/eddsa/clean.sh index 0bcd0ac23eb..8e2e225e19c 100644 --- a/bin/tests/system/eddsa/clean.sh +++ b/bin/tests/system/eddsa/clean.sh @@ -16,3 +16,4 @@ rm -f dig.out* rm -f */named.run rm -f */named.memstats rm -f ns*/named.lock +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/ednscompliance/clean.sh b/bin/tests/system/ednscompliance/clean.sh index 037fccf825d..37953dd6d16 100644 --- a/bin/tests/system/ednscompliance/clean.sh +++ b/bin/tests/system/ednscompliance/clean.sh @@ -14,3 +14,4 @@ rm -f ns*/named.lock rm -f ns*/named.conf rm -f ns*/named.run rm -f ns*/named.memstats +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/emptyzones/clean.sh b/bin/tests/system/emptyzones/clean.sh index 7826e73b27b..434b70835a0 100644 --- a/bin/tests/system/emptyzones/clean.sh +++ b/bin/tests/system/emptyzones/clean.sh @@ -12,3 +12,4 @@ rm -f ns*/named.lock rm -f ns*/named.run rm -f ns*/named.memstats rm -f dig.out.test* +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/fetchlimit/clean.sh b/bin/tests/system/fetchlimit/clean.sh index 9296105dfeb..6b6b9be3ef0 100644 --- a/bin/tests/system/fetchlimit/clean.sh +++ b/bin/tests/system/fetchlimit/clean.sh @@ -14,3 +14,4 @@ rm -f dig.out* rm -f ans4/norespond rm -f ns3/named.stats ns3/named_dump.db rm -f burst.input.* +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/fetchlimit/ns1/named.conf.in b/bin/tests/system/fetchlimit/ns1/named.conf.in index eabfe0cd00e..c434e8b06a6 100644 --- a/bin/tests/system/fetchlimit/ns1/named.conf.in +++ b/bin/tests/system/fetchlimit/ns1/named.conf.in @@ -18,6 +18,7 @@ options { listen-on { 10.53.0.1; }; listen-on-v6 { none; }; recursion no; + dnssec-validation no; notify yes; }; diff --git a/bin/tests/system/fetchlimit/ns2/named.conf.in b/bin/tests/system/fetchlimit/ns2/named.conf.in index 1892756ccb7..fc578624a75 100644 --- a/bin/tests/system/fetchlimit/ns2/named.conf.in +++ b/bin/tests/system/fetchlimit/ns2/named.conf.in @@ -18,6 +18,7 @@ options { listen-on { 10.53.0.2; }; listen-on-v6 { none; }; recursion no; + dnssec-validation no; notify yes; }; diff --git a/bin/tests/system/fetchlimit/ns3/named1.conf.in b/bin/tests/system/fetchlimit/ns3/named1.conf.in index b470f4633db..50c7bbb43bd 100644 --- a/bin/tests/system/fetchlimit/ns3/named1.conf.in +++ b/bin/tests/system/fetchlimit/ns3/named1.conf.in @@ -21,6 +21,7 @@ options { listen-on { 10.53.0.3; }; listen-on-v6 { none; }; recursion yes; + dnssec-validation yes; notify yes; fetches-per-server 400; }; diff --git a/bin/tests/system/fetchlimit/ns3/named2.conf.in b/bin/tests/system/fetchlimit/ns3/named2.conf.in index 001a95815ff..cc00ca41aee 100644 --- a/bin/tests/system/fetchlimit/ns3/named2.conf.in +++ b/bin/tests/system/fetchlimit/ns3/named2.conf.in @@ -19,6 +19,7 @@ options { listen-on { 10.53.0.3; }; listen-on-v6 { none; }; recursion yes; + dnssec-validation yes; notify yes; fetches-per-zone 40; }; diff --git a/bin/tests/system/fetchlimit/ns3/named3.conf.in b/bin/tests/system/fetchlimit/ns3/named3.conf.in index 0244a9a62fc..69c95dc4491 100644 --- a/bin/tests/system/fetchlimit/ns3/named3.conf.in +++ b/bin/tests/system/fetchlimit/ns3/named3.conf.in @@ -19,6 +19,7 @@ options { listen-on { 10.53.0.3; }; listen-on-v6 { none; }; recursion yes; + dnssec-validation yes; notify yes; recursive-clients 400; }; diff --git a/bin/tests/system/filter-aaaa/clean.sh b/bin/tests/system/filter-aaaa/clean.sh index 73732758f81..a282093ff27 100644 --- a/bin/tests/system/filter-aaaa/clean.sh +++ b/bin/tests/system/filter-aaaa/clean.sh @@ -25,3 +25,4 @@ rm -f ns4/dsset-* rm -f dig.out.* rm -f ns*/named.lock +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/filter-aaaa/ns1/named1.conf.in b/bin/tests/system/filter-aaaa/ns1/named1.conf.in index bd898554a03..55c1afe0939 100644 --- a/bin/tests/system/filter-aaaa/ns1/named1.conf.in +++ b/bin/tests/system/filter-aaaa/ns1/named1.conf.in @@ -18,6 +18,7 @@ options { listen-on { 10.53.0.1; }; listen-on-v6 { fd92:7065:b8e:ffff::1; }; recursion no; + dnssec-validation yes; notify yes; filter-aaaa-on-v4 yes; filter-aaaa { 10.53.0.1; }; diff --git a/bin/tests/system/filter-aaaa/ns1/named2.conf.in b/bin/tests/system/filter-aaaa/ns1/named2.conf.in index 9f86d759b00..6cf9d0d3335 100644 --- a/bin/tests/system/filter-aaaa/ns1/named2.conf.in +++ b/bin/tests/system/filter-aaaa/ns1/named2.conf.in @@ -18,6 +18,7 @@ options { listen-on { 10.53.0.1; }; listen-on-v6 { fd92:7065:b8e:ffff::1; }; recursion no; + dnssec-validation yes; notify yes; filter-aaaa-on-v6 yes; filter-aaaa { fd92:7065:b8e:ffff::1; }; diff --git a/bin/tests/system/filter-aaaa/ns2/named1.conf.in b/bin/tests/system/filter-aaaa/ns2/named1.conf.in index e188e4f11d8..7b43a97a461 100644 --- a/bin/tests/system/filter-aaaa/ns2/named1.conf.in +++ b/bin/tests/system/filter-aaaa/ns2/named1.conf.in @@ -18,6 +18,7 @@ options { listen-on { 10.53.0.2; }; listen-on-v6 { fd92:7065:b8e:ffff::2; }; recursion yes; + dnssec-validation yes; notify yes; filter-aaaa-on-v4 yes; filter-aaaa { 10.53.0.2; }; diff --git a/bin/tests/system/filter-aaaa/ns2/named2.conf.in b/bin/tests/system/filter-aaaa/ns2/named2.conf.in index e3216f89b2e..6a6b9baef7c 100644 --- a/bin/tests/system/filter-aaaa/ns2/named2.conf.in +++ b/bin/tests/system/filter-aaaa/ns2/named2.conf.in @@ -18,6 +18,7 @@ options { listen-on { 10.53.0.2; }; listen-on-v6 { fd92:7065:b8e:ffff::2; }; recursion yes; + dnssec-validation yes; notify yes; filter-aaaa-on-v6 yes; filter-aaaa { fd92:7065:b8e:ffff::2; }; diff --git a/bin/tests/system/filter-aaaa/ns3/named1.conf.in b/bin/tests/system/filter-aaaa/ns3/named1.conf.in index bc8193d82e1..60c97d2aa67 100644 --- a/bin/tests/system/filter-aaaa/ns3/named1.conf.in +++ b/bin/tests/system/filter-aaaa/ns3/named1.conf.in @@ -18,6 +18,7 @@ options { listen-on { 10.53.0.3; }; listen-on-v6 { fd92:7065:b8e:ffff::3; }; recursion yes; + dnssec-validation yes; notify yes; filter-aaaa-on-v4 break-dnssec; filter-aaaa { 10.53.0.3; }; diff --git a/bin/tests/system/filter-aaaa/ns3/named2.conf.in b/bin/tests/system/filter-aaaa/ns3/named2.conf.in index 051fdc04ab9..fd7b8c04d1c 100644 --- a/bin/tests/system/filter-aaaa/ns3/named2.conf.in +++ b/bin/tests/system/filter-aaaa/ns3/named2.conf.in @@ -18,6 +18,7 @@ options { listen-on { 10.53.0.3; }; listen-on-v6 { fd92:7065:b8e:ffff::3; }; recursion yes; + dnssec-validation yes; notify yes; filter-aaaa-on-v6 break-dnssec; filter-aaaa { fd92:7065:b8e:ffff::3; }; diff --git a/bin/tests/system/filter-aaaa/ns4/named1.conf.in b/bin/tests/system/filter-aaaa/ns4/named1.conf.in index eb5054d82c6..3f7cbcb16e1 100644 --- a/bin/tests/system/filter-aaaa/ns4/named1.conf.in +++ b/bin/tests/system/filter-aaaa/ns4/named1.conf.in @@ -18,6 +18,7 @@ options { listen-on { 10.53.0.4; }; listen-on-v6 { fd92:7065:b8e:ffff::4; }; recursion no; + dnssec-validation no; notify yes; filter-aaaa-on-v4 break-dnssec; filter-aaaa { 10.53.0.4; }; diff --git a/bin/tests/system/filter-aaaa/ns4/named2.conf.in b/bin/tests/system/filter-aaaa/ns4/named2.conf.in index 83baa449fbb..56a546e3599 100644 --- a/bin/tests/system/filter-aaaa/ns4/named2.conf.in +++ b/bin/tests/system/filter-aaaa/ns4/named2.conf.in @@ -18,6 +18,7 @@ options { listen-on { 10.53.0.4; }; listen-on-v6 { fd92:7065:b8e:ffff::4; }; recursion no; + dnssec-validation no; notify yes; filter-aaaa-on-v6 break-dnssec; filter-aaaa { fd92:7065:b8e:ffff::4; }; diff --git a/bin/tests/system/formerr/clean.sh b/bin/tests/system/formerr/clean.sh index 0bb0e3d2692..693d703467a 100644 --- a/bin/tests/system/formerr/clean.sh +++ b/bin/tests/system/formerr/clean.sh @@ -14,3 +14,4 @@ rm -f ns*/named.conf rm -f ns*/named.lock rm -f ns*/named.run rm -f ns*/named.memstats +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/forward/clean.sh b/bin/tests/system/forward/clean.sh index 3052d2773a2..3c0dd682dd5 100644 --- a/bin/tests/system/forward/clean.sh +++ b/bin/tests/system/forward/clean.sh @@ -15,3 +15,4 @@ rm -f */named.conf rm -f */named.memstats rm -f */named.run rm -f ns*/named.lock +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/forward/ns1/named.conf.in b/bin/tests/system/forward/ns1/named.conf.in index 7ce81dde055..462b7378c01 100644 --- a/bin/tests/system/forward/ns1/named.conf.in +++ b/bin/tests/system/forward/ns1/named.conf.in @@ -18,6 +18,7 @@ options { listen-on { 10.53.0.1; }; listen-on-v6 { none; }; recursion no; + dnssec-validation no; }; zone "." { diff --git a/bin/tests/system/forward/ns2/named.conf.in b/bin/tests/system/forward/ns2/named.conf.in index ff104d466f7..522e9653930 100644 --- a/bin/tests/system/forward/ns2/named.conf.in +++ b/bin/tests/system/forward/ns2/named.conf.in @@ -18,6 +18,7 @@ options { listen-on { 10.53.0.2; }; listen-on-v6 { none; }; recursion no; + dnssec-validation no; }; zone "." { diff --git a/bin/tests/system/forward/ns3/named.conf.in b/bin/tests/system/forward/ns3/named.conf.in index 80a4f7e684c..0fdcf65e524 100644 --- a/bin/tests/system/forward/ns3/named.conf.in +++ b/bin/tests/system/forward/ns3/named.conf.in @@ -19,6 +19,7 @@ options { listen-on-v6 { none; }; forwarders { 10.53.0.2; }; forward first; + dnssec-validation yes; }; zone "." { diff --git a/bin/tests/system/forward/ns4/named.conf.in b/bin/tests/system/forward/ns4/named.conf.in index 480530b0f27..971fe0c487e 100644 --- a/bin/tests/system/forward/ns4/named.conf.in +++ b/bin/tests/system/forward/ns4/named.conf.in @@ -17,6 +17,8 @@ options { pid-file "named.pid"; listen-on { 10.53.0.4; }; listen-on-v6 { none; }; + recursion yes; + dnssec-validation yes; }; zone "." { diff --git a/bin/tests/system/forward/ns5/named.conf.in b/bin/tests/system/forward/ns5/named.conf.in index 0e65985d526..f86de1a4241 100644 --- a/bin/tests/system/forward/ns5/named.conf.in +++ b/bin/tests/system/forward/ns5/named.conf.in @@ -19,6 +19,7 @@ options { listen-on-v6 { none; }; forward only; forwarders { 10.53.0.4; }; + dnssec-validation yes; }; zone "." { diff --git a/bin/tests/system/geoip/clean.sh b/bin/tests/system/geoip/clean.sh index d6fe94b852c..85caf2f86f6 100644 --- a/bin/tests/system/geoip/clean.sh +++ b/bin/tests/system/geoip/clean.sh @@ -17,3 +17,4 @@ rm -f data2/*dat rm -f ns?/named.run rm -f ns?/named.memstats rm -f ns*/named.lock +rm -f ns*/managed-keys.bind* ns*/*.mkeys* diff --git a/bin/tests/system/geoip/ns2/named1.conf.in b/bin/tests/system/geoip/ns2/named1.conf.in index a42531196da..e926f683d06 100644 --- a/bin/tests/system/geoip/ns2/named1.conf.in +++ b/bin/tests/system/geoip/ns2/named1.conf.in @@ -20,6 +20,7 @@ options { listen-on { 10.53.0.2; }; listen-on-v6 { none; }; recursion no; + dnssec-validation no; geoip-directory "../data"; }; diff --git a/bin/tests/system/geoip/ns2/named10.conf.in b/bin/tests/system/geoip/ns2/named10.conf.in index 1372d410f0a..75f86bb2238 100644 --- a/bin/tests/system/geoip/ns2/named10.conf.in +++ b/bin/tests/system/geoip/ns2/named10.conf.in @@ -20,6 +20,7 @@ options { listen-on { 10.53.0.2; }; listen-on-v6 { none; }; recursion no; + dnssec-validation no; geoip-directory "../data"; }; diff --git a/bin/tests/system/geoip/ns2/named11.conf.in b/bin/tests/system/geoip/ns2/named11.conf.in index c7a0ad2d58d..694b163b63b 100644 --- a/bin/tests/system/geoip/ns2/named11.conf.in +++ b/bin/tests/system/geoip/ns2/named11.conf.in @@ -20,6 +20,7 @@ options { listen-on { 10.53.0.2; }; listen-on-v6 { none; }; recursion no; + dnssec-validation no; geoip-directory "../data"; }; diff --git a/bin/tests/system/geoip/ns2/named12.conf.in b/bin/tests/system/geoip/ns2/named12.conf.in index 68abc85f164..c731d8bcb47 100644 --- a/bin/tests/system/geoip/ns2/named12.conf.in +++ b/bin/tests/system/geoip/ns2/named12.conf.in @@ -20,6 +20,7 @@ options { listen-on { 10.53.0.2; }; listen-on-v6 { none; }; recursion no; + dnssec-validation no; geoip-directory "../data"; }; diff --git a/bin/tests/system/geoip/ns2/named13.conf.in b/bin/tests/system/geoip/ns2/named13.conf.in index 05a331406de..9f25514c9bc 100644 --- a/bin/tests/system/geoip/ns2/named13.conf.in +++ b/bin/tests/system/geoip/ns2/named13.conf.in @@ -24,6 +24,7 @@ options { listen-on { 10.53.0.2; }; listen-on-v6 { none; }; recursion no; + dnssec-validation no; geoip-directory "../data"; blackhole { blocking; }; }; diff --git a/bin/tests/system/geoip/ns2/named14.conf.in b/bin/tests/system/geoip/ns2/named14.conf.in index 9689b1e2bf4..34902f47ffb 100644 --- a/bin/tests/system/geoip/ns2/named14.conf.in +++ b/bin/tests/system/geoip/ns2/named14.conf.in @@ -20,6 +20,7 @@ options { listen-on { 127.0.0.1; 10.53.0.2; }; listen-on-v6 { none; }; recursion no; + dnssec-validation no; geoip-directory "../data"; }; diff --git a/bin/tests/system/geoip/ns2/named15.conf.in b/bin/tests/system/geoip/ns2/named15.conf.in index 01ee377cba0..6481ceb8d43 100644 --- a/bin/tests/system/geoip/ns2/named15.conf.in +++ b/bin/tests/system/geoip/ns2/named15.conf.in @@ -20,6 +20,7 @@ options { listen-on { 10.53.0.2; }; listen-on-v6 { fd92:7065:b8e:ffff::2; }; recursion no; + dnssec-validation no; geoip-directory "../data2"; }; diff --git a/bin/tests/system/geoip/ns2/named2.conf.in b/bin/tests/system/geoip/ns2/named2.conf.in index 541f904b38f..41514d2663d 100644 --- a/bin/tests/system/geoip/ns2/named2.conf.in +++ b/bin/tests/system/geoip/ns2/named2.conf.in @@ -20,6 +20,7 @@ options { listen-on { 10.53.0.2; }; listen-on-v6 { none; }; recursion no; + dnssec-validation no; geoip-directory "../data"; }; diff --git a/bin/tests/system/geoip/ns2/named3.conf.in b/bin/tests/system/geoip/ns2/named3.conf.in index a8cf6a3a8e0..bc45fde7e96 100644 --- a/bin/tests/system/geoip/ns2/named3.conf.in +++ b/bin/tests/system/geoip/ns2/named3.conf.in @@ -20,6 +20,7 @@ options { listen-on { 10.53.0.2; }; listen-on-v6 { none; }; recursion no; + dnssec-validation no; geoip-directory "../data"; }; diff --git a/bin/tests/system/geoip/ns2/named4.conf.in b/bin/tests/system/geoip/ns2/named4.conf.in index 81e3e65d4a3..4b9881e2371 100644 --- a/bin/tests/system/geoip/ns2/named4.conf.in +++ b/bin/tests/system/geoip/ns2/named4.conf.in @@ -20,6 +20,7 @@ options { listen-on { 10.53.0.2; }; listen-on-v6 { none; }; recursion no; + dnssec-validation no; geoip-directory "../data"; }; diff --git a/bin/tests/system/geoip/ns2/named5.conf.in b/bin/tests/system/geoip/ns2/named5.conf.in index 0c4ce5084ba..a9091c59689 100644 --- a/bin/tests/system/geoip/ns2/named5.conf.in +++ b/bin/tests/system/geoip/ns2/named5.conf.in @@ -20,6 +20,7 @@ options { listen-on { 10.53.0.2; }; listen-on-v6 { none; }; recursion no; + dnssec-validation no; geoip-directory "../data"; }; diff --git a/bin/tests/system/geoip/ns2/named6.conf.in b/bin/tests/system/geoip/ns2/named6.conf.in index 195133bf9ff..035e088b6d6 100644 --- a/bin/tests/system/geoip/ns2/named6.conf.in +++ b/bin/tests/system/geoip/ns2/named6.conf.in @@ -20,6 +20,7 @@ options { listen-on { 10.53.0.2; }; listen-on-v6 { fd92:7065:b8e:ffff::1; }; recursion no; + dnssec-validation no; geoip-directory "../data"; }; diff --git a/bin/tests/system/geoip/ns2/named7.conf.in b/bin/tests/system/geoip/ns2/named7.conf.in index 4fa4626da25..511e0277b3c 100644 --- a/bin/tests/system/geoip/ns2/named7.conf.in +++ b/bin/tests/system/geoip/ns2/named7.conf.in @@ -20,6 +20,7 @@ options { listen-on { 10.53.0.2; }; listen-on-v6 { none; }; recursion no; + dnssec-validation no; geoip-directory "../data"; }; diff --git a/bin/tests/system/geoip/ns2/named8.conf.in b/bin/tests/system/geoip/ns2/named8.conf.in index 2840c8fbc54..7297c0f20e1 100644 --- a/bin/tests/system/geoip/ns2/named8.conf.in +++ b/bin/tests/system/geoip/ns2/named8.conf.in @@ -20,6 +20,7 @@ options { listen-on { 10.53.0.2; }; listen-on-v6 { none; }; recursion no; + dnssec-validation no; geoip-directory "../data"; }; diff --git a/bin/tests/system/geoip/ns2/named9.conf.in b/bin/tests/system/geoip/ns2/named9.conf.in index 720f7accb99..93b40ff533c 100644 --- a/bin/tests/system/geoip/ns2/named9.conf.in +++ b/bin/tests/system/geoip/ns2/named9.conf.in @@ -20,6 +20,7 @@ options { listen-on { 10.53.0.2; }; listen-on-v6 { none; }; recursion no; + dnssec-validation no; geoip-directory "../data"; }; diff --git a/bin/tests/system/glue/clean.sh b/bin/tests/system/glue/clean.sh index 25e408dc12b..d3dab3e7e6a 100644 --- a/bin/tests/system/glue/clean.sh +++ b/bin/tests/system/glue/clean.sh @@ -18,3 +18,4 @@ rm -f */named.conf rm -f */named.memstats rm -f */named.run rm -f ns*/named.lock +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/gost/clean.sh b/bin/tests/system/gost/clean.sh index 3779676eea4..6cfeec24663 100644 --- a/bin/tests/system/gost/clean.sh +++ b/bin/tests/system/gost/clean.sh @@ -16,3 +16,4 @@ rm -f dig.out* rm -f */named.run rm -f */named.memstats rm -f ns*/named.lock +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/idna/clean.sh b/bin/tests/system/idna/clean.sh index 7a8e0d3aaf5..7f1c61c3fb7 100644 --- a/bin/tests/system/idna/clean.sh +++ b/bin/tests/system/idna/clean.sh @@ -14,3 +14,4 @@ rm -f */named.run rm -f */named.conf rm -f dig.out.* rm -f ns*/named.lock +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/inline/clean.sh b/bin/tests/system/inline/clean.sh index 80e5eb914d5..7da6af1a15b 100644 --- a/bin/tests/system/inline/clean.sh +++ b/bin/tests/system/inline/clean.sh @@ -121,3 +121,4 @@ rm -f dig.out.* rm -f ns3/nzf-* rm -f rndc.out.ns* rm -rf ns3/removedkeys +rm -f ns*/managed-keys.bind* ns*/*.mkeys* diff --git a/bin/tests/system/integrity/clean.sh b/bin/tests/system/integrity/clean.sh index d9c14533b98..9b9c6b3cc35 100644 --- a/bin/tests/system/integrity/clean.sh +++ b/bin/tests/system/integrity/clean.sh @@ -13,3 +13,4 @@ rm -f dig.out.test* rm -f */named.memstats rm -f */named.conf rm -f */named.run +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/ixfr/clean.sh b/bin/tests/system/ixfr/clean.sh index a935a955a71..d75c36e4eb8 100644 --- a/bin/tests/system/ixfr/clean.sh +++ b/bin/tests/system/ixfr/clean.sh @@ -19,3 +19,4 @@ rm -f */ans.run rm -f dig.out dig.out1 dig.out2 dig.out3 rm -f ns3/large.db rm -f ns*/named.lock +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/keepalive/clean.sh b/bin/tests/system/keepalive/clean.sh index 53b12b031b8..6398ac56ac4 100644 --- a/bin/tests/system/keepalive/clean.sh +++ b/bin/tests/system/keepalive/clean.sh @@ -14,3 +14,4 @@ rm -f ns*/named.run rm -f ns*/named.conf rm -f ns*/named.stats rm -f ns*/named.lock +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/keymgr/clean.sh b/bin/tests/system/keymgr/clean.sh index dc9f0a0c843..ba4908a2333 100644 --- a/bin/tests/system/keymgr/clean.sh +++ b/bin/tests/system/keymgr/clean.sh @@ -13,3 +13,4 @@ rm -f */K*.key rm -f */K*.private rm -f coverage.* keymgr.* rm -f policy.out +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/legacy/clean.sh b/bin/tests/system/legacy/clean.sh index 50237dc5a3a..79432ec3979 100644 --- a/bin/tests/system/legacy/clean.sh +++ b/bin/tests/system/legacy/clean.sh @@ -23,3 +23,4 @@ rm -f ns7/dsset-* rm -f ns7/edns512-notcp.db rm -f ns7/signer.err rm -f ns7/trusted.conf +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/legacy/ns1/named1.conf.in b/bin/tests/system/legacy/ns1/named1.conf.in index c5833a41c68..d62480b04dc 100644 --- a/bin/tests/system/legacy/ns1/named1.conf.in +++ b/bin/tests/system/legacy/ns1/named1.conf.in @@ -18,6 +18,7 @@ options { listen-on { 10.53.0.1; }; listen-on-v6 { none; }; recursion yes; + dnssec-validation yes; }; zone "." { diff --git a/bin/tests/system/legacy/ns1/named2.conf.in b/bin/tests/system/legacy/ns1/named2.conf.in index e3edb027a19..9a5581786fa 100644 --- a/bin/tests/system/legacy/ns1/named2.conf.in +++ b/bin/tests/system/legacy/ns1/named2.conf.in @@ -18,6 +18,7 @@ options { listen-on { 10.53.0.1; }; listen-on-v6 { none; }; recursion yes; + dnssec-validation yes; }; zone "." { diff --git a/bin/tests/system/legacy/ns2/named.conf.in b/bin/tests/system/legacy/ns2/named.conf.in index 552227d6c8c..1e0a55a889d 100644 --- a/bin/tests/system/legacy/ns2/named.conf.in +++ b/bin/tests/system/legacy/ns2/named.conf.in @@ -18,6 +18,7 @@ options { listen-on { 10.53.0.2; }; listen-on-v6 { none; }; recursion no; + dnssec-validation no; }; zone "dropedns" { diff --git a/bin/tests/system/legacy/ns3/named.conf.in b/bin/tests/system/legacy/ns3/named.conf.in index 8d10f9372d1..e4c2c1bab5c 100644 --- a/bin/tests/system/legacy/ns3/named.conf.in +++ b/bin/tests/system/legacy/ns3/named.conf.in @@ -18,6 +18,7 @@ options { listen-on { 10.53.0.3; }; listen-on-v6 { none; }; recursion no; + dnssec-validation no; }; zone "dropedns-notcp" { diff --git a/bin/tests/system/legacy/ns4/named.conf.in b/bin/tests/system/legacy/ns4/named.conf.in index 91c1203245b..068c99ec8b9 100644 --- a/bin/tests/system/legacy/ns4/named.conf.in +++ b/bin/tests/system/legacy/ns4/named.conf.in @@ -18,6 +18,7 @@ options { listen-on { 10.53.0.4; }; listen-on-v6 { none; }; recursion no; + dnssec-validation no; }; zone "plain" { diff --git a/bin/tests/system/legacy/ns5/named.conf.in b/bin/tests/system/legacy/ns5/named.conf.in index 2cb4af43b2f..283b1747629 100644 --- a/bin/tests/system/legacy/ns5/named.conf.in +++ b/bin/tests/system/legacy/ns5/named.conf.in @@ -18,6 +18,7 @@ options { listen-on { 10.53.0.5; }; listen-on-v6 { none; }; recursion no; + dnssec-validation no; }; zone "plain-notcp" { diff --git a/bin/tests/system/legacy/ns6/named.conf.in b/bin/tests/system/legacy/ns6/named.conf.in index 8080003780b..a62ccf1db39 100644 --- a/bin/tests/system/legacy/ns6/named.conf.in +++ b/bin/tests/system/legacy/ns6/named.conf.in @@ -18,6 +18,7 @@ options { listen-on { 10.53.0.6; }; listen-on-v6 { none; }; recursion no; + dnssec-validation no; }; zone "edns512" { diff --git a/bin/tests/system/legacy/ns7/named.conf.in b/bin/tests/system/legacy/ns7/named.conf.in index d48a190c625..6aa47013f70 100644 --- a/bin/tests/system/legacy/ns7/named.conf.in +++ b/bin/tests/system/legacy/ns7/named.conf.in @@ -18,6 +18,7 @@ options { listen-on { 10.53.0.7; }; listen-on-v6 { none; }; recursion no; + dnssec-validation no; }; zone "edns512-notcp" { diff --git a/bin/tests/system/limits/clean.sh b/bin/tests/system/limits/clean.sh index 73f4bc3a8d7..8425db3d46a 100644 --- a/bin/tests/system/limits/clean.sh +++ b/bin/tests/system/limits/clean.sh @@ -17,3 +17,4 @@ rm -f */named.memstats rm -f */named.conf rm -f */named.run rm -f ns*/named.lock +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/logfileconfig/clean.sh b/bin/tests/system/logfileconfig/clean.sh index cdeef433d06..9aef96a51a4 100644 --- a/bin/tests/system/logfileconfig/clean.sh +++ b/bin/tests/system/logfileconfig/clean.sh @@ -32,3 +32,4 @@ rm -f ns1/named_ts rm -f ns1/named_ts.* rm -f ns1/named_unlimited rm -f ns1/named_unlimited.* +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/masterfile/clean.sh b/bin/tests/system/masterfile/clean.sh index 894e75a0854..11cc2c95882 100644 --- a/bin/tests/system/masterfile/clean.sh +++ b/bin/tests/system/masterfile/clean.sh @@ -15,3 +15,4 @@ rm -f */named.conf rm -f */named.run rm -f ns*/named.lock rm -f checkzone.out* +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/masterformat/clean.sh b/bin/tests/system/masterformat/clean.sh index d50ed954537..84bca8ca74f 100755 --- a/bin/tests/system/masterformat/clean.sh +++ b/bin/tests/system/masterformat/clean.sh @@ -31,3 +31,4 @@ rm -f baseline.txt text.1 text.2 raw.1 raw.2 map.1 map.2 map.5 text.5 badmap rm -f ns1/Ksigned.* ns1/dsset-signed. ns1/signed.db.signed rm -f rndc.out rm -f ns*/named.lock +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/mkeys/clean.sh b/bin/tests/system/mkeys/clean.sh index df237a7395f..503f79a5d26 100644 --- a/bin/tests/system/mkeys/clean.sh +++ b/bin/tests/system/mkeys/clean.sh @@ -20,3 +20,4 @@ rm -f ns1/named.secroots ns1/root.db.signed* ns1/root.db.tmp rm -f */named.conf rm -rf ns4/nope rm -f ns5/named.args +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/names/clean.sh b/bin/tests/system/names/clean.sh index b7e34ebefd8..e83b11f60b3 100644 --- a/bin/tests/system/names/clean.sh +++ b/bin/tests/system/names/clean.sh @@ -15,3 +15,4 @@ rm -f ns*/named.memstats rm -f ns*/named.run rm -f ns*/named.pid rm -f ns*/named.conf +rm -f ns*/managed-keys.bind* ns*/*.mkeys* diff --git a/bin/tests/system/notify/clean.sh b/bin/tests/system/notify/clean.sh index 7f0b4075bca..ef42efa154e 100644 --- a/bin/tests/system/notify/clean.sh +++ b/bin/tests/system/notify/clean.sh @@ -33,3 +33,4 @@ rm -f ns5/x21.bk-c rm -f ns5/x21.bk-c.jnl rm -f ns5/x21.db.jnl rm -f tmp +rm -f ns*/managed-keys.bind* ns*/*.mkeys* diff --git a/bin/tests/system/nslookup/clean.sh b/bin/tests/system/nslookup/clean.sh index 46d78fa7b3c..6c0cb039aa9 100644 --- a/bin/tests/system/nslookup/clean.sh +++ b/bin/tests/system/nslookup/clean.sh @@ -13,3 +13,4 @@ rm -f ns*/named.lock rm -f ns*/named.memstats rm -f ns*/named.run rm -f ns*/named.conf +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/nsupdate/clean.sh b/bin/tests/system/nsupdate/clean.sh index 74af65d96a2..7975532f8ec 100644 --- a/bin/tests/system/nsupdate/clean.sh +++ b/bin/tests/system/nsupdate/clean.sh @@ -46,3 +46,4 @@ rm -f ns2/sample.db rm -f update.out.* rm -f check.out.* rm -f update.out.* +rm -f ns*/managed-keys.bind* ns*/*.mkeys* diff --git a/bin/tests/system/nzd2nzf/clean.sh b/bin/tests/system/nzd2nzf/clean.sh index 8b58ed33d3c..3a6ad6d9b93 100644 --- a/bin/tests/system/nzd2nzf/clean.sh +++ b/bin/tests/system/nzd2nzf/clean.sh @@ -16,3 +16,4 @@ rm -f dig.out.* rm -f rndc.out* rm -f ns*/*.nzf rm -f ns*/*.nzd ns*/*.nzd-lock +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/padding/clean.sh b/bin/tests/system/padding/clean.sh index f08874606d5..a6e557f71f1 100644 --- a/bin/tests/system/padding/clean.sh +++ b/bin/tests/system/padding/clean.sh @@ -13,3 +13,4 @@ rm -f ns*/named.run rm -f ns*/named.stats rm -f ns*/named.lock rm -f ns*/named.conf +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/pending/clean.sh b/bin/tests/system/pending/clean.sh index f0041837831..1979e715234 100644 --- a/bin/tests/system/pending/clean.sh +++ b/bin/tests/system/pending/clean.sh @@ -22,3 +22,4 @@ rm -rf ns2/example.com.db rm -rf nsupdate.out.test rm -f ns*/named.lock rm -f ns*/named.conf +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/pipelined/clean.sh b/bin/tests/system/pipelined/clean.sh index f4c4b131b90..2517b94e02f 100644 --- a/bin/tests/system/pipelined/clean.sh +++ b/bin/tests/system/pipelined/clean.sh @@ -14,3 +14,4 @@ rm -f */named.memstats rm -f */named.run rm -f raw* output* rm -f ns*/named.lock +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/pipelined/ns1/named.conf.in b/bin/tests/system/pipelined/ns1/named.conf.in index 828bc40b7b4..1a6ec06b4d4 100644 --- a/bin/tests/system/pipelined/ns1/named.conf.in +++ b/bin/tests/system/pipelined/ns1/named.conf.in @@ -18,6 +18,7 @@ options { listen-on { 10.53.0.1; }; listen-on-v6 { none; }; recursion no; + dnssec-validation no; notify yes; }; diff --git a/bin/tests/system/pipelined/ns2/named.conf.in b/bin/tests/system/pipelined/ns2/named.conf.in index 6df0c663a0a..291e66ab06c 100644 --- a/bin/tests/system/pipelined/ns2/named.conf.in +++ b/bin/tests/system/pipelined/ns2/named.conf.in @@ -18,6 +18,7 @@ options { listen-on { 10.53.0.2; }; listen-on-v6 { none; }; recursion yes; + dnssec-validation yes; notify yes; }; diff --git a/bin/tests/system/pipelined/ns3/named.conf.in b/bin/tests/system/pipelined/ns3/named.conf.in index a17babd54c2..25614d865f6 100644 --- a/bin/tests/system/pipelined/ns3/named.conf.in +++ b/bin/tests/system/pipelined/ns3/named.conf.in @@ -18,6 +18,7 @@ options { listen-on { 10.53.0.3; }; listen-on-v6 { none; }; recursion yes; + dnssec-validation yes; notify yes; }; diff --git a/bin/tests/system/pipelined/ns4/named.conf.in b/bin/tests/system/pipelined/ns4/named.conf.in index 0b8a54b5aaf..14cdc4f73b4 100644 --- a/bin/tests/system/pipelined/ns4/named.conf.in +++ b/bin/tests/system/pipelined/ns4/named.conf.in @@ -20,6 +20,7 @@ options { listen-on-v6 { none; }; keep-response-order { 10.53.0.7/32; }; recursion yes; + dnssec-validation yes; notify yes; }; diff --git a/bin/tests/system/pkcs11/clean.sh b/bin/tests/system/pkcs11/clean.sh index f5be432d98e..4960cd1358b 100644 --- a/bin/tests/system/pkcs11/clean.sh +++ b/bin/tests/system/pkcs11/clean.sh @@ -14,3 +14,4 @@ rm -f dig.out* pin upd.log* rm -f ns1/*.key ns1/named.memstats rm -f supported rm -f ns*/named.lock +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/pkcs11/ns1/named.conf b/bin/tests/system/pkcs11/ns1/named.conf index 5ac9a2fbe69..0e96eda38a7 100644 --- a/bin/tests/system/pkcs11/ns1/named.conf +++ b/bin/tests/system/pkcs11/ns1/named.conf @@ -20,6 +20,7 @@ options { listen-on { 10.53.0.1; }; listen-on-v6 { none; }; recursion no; + dnssec-validation no; notify no; }; diff --git a/bin/tests/system/pkcs11ssl/clean.sh b/bin/tests/system/pkcs11ssl/clean.sh index 4af1c397c68..1fed82ca192 100644 --- a/bin/tests/system/pkcs11ssl/clean.sh +++ b/bin/tests/system/pkcs11ssl/clean.sh @@ -14,3 +14,4 @@ rm -f dig.out pin rm -f ns1/*.key ns1/named.memstats rm -f supported rm -f ns*/named.lock +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/pkcs11ssl/ns1/named.conf b/bin/tests/system/pkcs11ssl/ns1/named.conf index 7cd80742011..77d970ec579 100644 --- a/bin/tests/system/pkcs11ssl/ns1/named.conf +++ b/bin/tests/system/pkcs11ssl/ns1/named.conf @@ -20,6 +20,7 @@ options { listen-on { 10.53.0.1; }; listen-on-v6 { none; }; recursion no; + dnssec-validation no; notify no; }; diff --git a/bin/tests/system/reclimit/clean.sh b/bin/tests/system/reclimit/clean.sh index f856c8608d7..7a5d73a4b59 100644 --- a/bin/tests/system/reclimit/clean.sh +++ b/bin/tests/system/reclimit/clean.sh @@ -16,3 +16,4 @@ rm -f ns?/named.memstats rm -f ns?/named.run rm -f ns*/named.conf rm -f ns*/named.lock +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/reclimit/ns1/named.conf.in b/bin/tests/system/reclimit/ns1/named.conf.in index f8868f5176d..00fa44b3baa 100644 --- a/bin/tests/system/reclimit/ns1/named.conf.in +++ b/bin/tests/system/reclimit/ns1/named.conf.in @@ -19,6 +19,7 @@ options { listen-on { 10.53.0.1; }; listen-on-v6 { none; }; recursion no; + dnssec-validation no; }; zone "." { type master; file "root.db"; }; diff --git a/bin/tests/system/reclimit/ns3/named1.conf.in b/bin/tests/system/reclimit/ns3/named1.conf.in index f7f6c6a7651..a649db11e33 100644 --- a/bin/tests/system/reclimit/ns3/named1.conf.in +++ b/bin/tests/system/reclimit/ns3/named1.conf.in @@ -20,6 +20,8 @@ options { listen-on-v6 { none; }; servfail-ttl 0; max-recursion-depth 12; + recursion yes; + dnssec-validation yes; }; key rndc_key { diff --git a/bin/tests/system/reclimit/ns3/named2.conf.in b/bin/tests/system/reclimit/ns3/named2.conf.in index f051cf531c0..806eb5170ee 100644 --- a/bin/tests/system/reclimit/ns3/named2.conf.in +++ b/bin/tests/system/reclimit/ns3/named2.conf.in @@ -20,6 +20,8 @@ options { listen-on-v6 { none; }; servfail-ttl 0; max-recursion-depth 5; + recursion yes; + dnssec-validation yes; }; key rndc_key { diff --git a/bin/tests/system/reclimit/ns3/named3.conf.in b/bin/tests/system/reclimit/ns3/named3.conf.in index 6c235aff52c..a0c87a2dd91 100644 --- a/bin/tests/system/reclimit/ns3/named3.conf.in +++ b/bin/tests/system/reclimit/ns3/named3.conf.in @@ -21,6 +21,8 @@ options { servfail-ttl 0; max-recursion-depth 100; max-recursion-queries 50; + recursion yes; + dnssec-validation yes; }; key rndc_key { diff --git a/bin/tests/system/reclimit/ns3/named4.conf.in b/bin/tests/system/reclimit/ns3/named4.conf.in index 2d7d5c18b2c..dd254ad6a14 100644 --- a/bin/tests/system/reclimit/ns3/named4.conf.in +++ b/bin/tests/system/reclimit/ns3/named4.conf.in @@ -21,6 +21,8 @@ options { servfail-ttl 0; max-recursion-depth 100; max-recursion-queries 40; + recursion yes; + dnssec-validation yes; }; key rndc_key { diff --git a/bin/tests/system/redirect/clean.sh b/bin/tests/system/redirect/clean.sh index c13d918dadd..27a65d2a5e3 100644 --- a/bin/tests/system/redirect/clean.sh +++ b/bin/tests/system/redirect/clean.sh @@ -28,3 +28,4 @@ rm -f ns3/nsec3.db* rm -f ns3/signed.db* rm -f ns4/*.db rm -f rndc.out +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/resolver/clean.sh b/bin/tests/system/resolver/clean.sh index 4dfde1f3e72..78c95aeb408 100644 --- a/bin/tests/system/resolver/clean.sh +++ b/bin/tests/system/resolver/clean.sh @@ -34,3 +34,4 @@ rm -f resolve.out.*.test* rm -f .digrc rm -f ns*/named.lock rm -f ns5/trusted.conf +rm -f ns*/managed-keys.bind* ns*/*.mkeys* diff --git a/bin/tests/system/resolver/ns1/named.conf.in b/bin/tests/system/resolver/ns1/named.conf.in index af83a70c02e..c7d5d14ce5d 100644 --- a/bin/tests/system/resolver/ns1/named.conf.in +++ b/bin/tests/system/resolver/ns1/named.conf.in @@ -18,6 +18,7 @@ options { listen-on { 10.53.0.1; }; listen-on-v6 { none; }; recursion yes; + dnssec-validation yes; deny-answer-addresses { 192.0.2.0/24; 2001:db8:beef::/48; } except-from { "example.org"; }; deny-answer-aliases { "example.org"; } diff --git a/bin/tests/system/resolver/ns4/named.conf.in b/bin/tests/system/resolver/ns4/named.conf.in index c679dc31515..2a6d90960f2 100644 --- a/bin/tests/system/resolver/ns4/named.conf.in +++ b/bin/tests/system/resolver/ns4/named.conf.in @@ -20,7 +20,7 @@ options { listen-on { 10.53.0.4; }; listen-on-v6 { none; }; recursion no; - // minimal-responses yes; + dnssec-validation no; /* test that named loads with root-delegation-only */ root-delegation-only; }; diff --git a/bin/tests/system/resolver/ns5/named.conf.in b/bin/tests/system/resolver/ns5/named.conf.in index 07205c9938c..b1d431e7038 100644 --- a/bin/tests/system/resolver/ns5/named.conf.in +++ b/bin/tests/system/resolver/ns5/named.conf.in @@ -20,6 +20,7 @@ options { listen-on { 10.53.0.5; }; listen-on-v6 { none; }; recursion yes; + dnssec-validation yes; querylog yes; }; diff --git a/bin/tests/system/resolver/ns6/named.conf.in b/bin/tests/system/resolver/ns6/named.conf.in index 1fcfa0cd52a..6661620e13f 100644 --- a/bin/tests/system/resolver/ns6/named.conf.in +++ b/bin/tests/system/resolver/ns6/named.conf.in @@ -20,7 +20,7 @@ options { listen-on { 10.53.0.6; }; listen-on-v6 { none; }; recursion no; - // minimal-responses yes; + dnssec-validation no; querylog yes; /* * test that named loads with root-delegation-only that diff --git a/bin/tests/system/resolver/ns7/named1.conf.in b/bin/tests/system/resolver/ns7/named1.conf.in index 6828ad2672e..787705984d1 100644 --- a/bin/tests/system/resolver/ns7/named1.conf.in +++ b/bin/tests/system/resolver/ns7/named1.conf.in @@ -20,6 +20,7 @@ options { listen-on { 10.53.0.7; }; listen-on-v6 { none; }; recursion yes; + dnssec-validation yes; empty-zones-enable yes; disable-empty-zone 20.172.in-addr.arpa; /* diff --git a/bin/tests/system/resolver/ns7/named2.conf.in b/bin/tests/system/resolver/ns7/named2.conf.in index ad8988f3448..b966e783b7d 100644 --- a/bin/tests/system/resolver/ns7/named2.conf.in +++ b/bin/tests/system/resolver/ns7/named2.conf.in @@ -20,6 +20,7 @@ options { listen-on { 10.53.0.7; }; listen-on-v6 { none; }; recursion yes; + dnssec-validation yes; empty-zones-enable yes; disable-empty-zone 20.172.in-addr.arpa; /* diff --git a/bin/tests/system/rndc/clean.sh b/bin/tests/system/rndc/clean.sh index df8aa77210f..65393720bdb 100644 --- a/bin/tests/system/rndc/clean.sh +++ b/bin/tests/system/rndc/clean.sh @@ -24,3 +24,4 @@ rm -f ns*/named.conf rm -f nsupdate.out.*.test* rm -f python.out.*.test* rm -f rndc.out.*.test* +rm -f ns*/managed-keys.bind* ns*/*.mkeys* diff --git a/bin/tests/system/rootkeysentinel/clean.sh b/bin/tests/system/rootkeysentinel/clean.sh index 702002bc4c7..58b52739457 100644 --- a/bin/tests/system/rootkeysentinel/clean.sh +++ b/bin/tests/system/rootkeysentinel/clean.sh @@ -21,3 +21,4 @@ rm -f ns1/root.db.signed rm -f ns2/Kexample.* rm -f ns2/example.db rm -f ns2/example.db.signed +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/rpz/clean.sh b/bin/tests/system/rpz/clean.sh index c4e1872aa02..44ceff4c4ae 100644 --- a/bin/tests/system/rpz/clean.sh +++ b/bin/tests/system/rpz/clean.sh @@ -22,3 +22,4 @@ rm -f dnsrps*.conf rm -f dnsrpzd.conf rm -f dnsrpzd-license-cur.conf dnsrpzd.rpzf dnsrpzd.sock dnsrpzd.pid rm -f tmp +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/rpzrecurse/clean.sh b/bin/tests/system/rpzrecurse/clean.sh index 85f1fe92c33..ffd9dfd50a8 100644 --- a/bin/tests/system/rpzrecurse/clean.sh +++ b/bin/tests/system/rpzrecurse/clean.sh @@ -26,3 +26,4 @@ rm -f ns3/named2.conf rm -f dnsrps*.conf dnsrpzd* rm -f ns*/session.key +rm -f ns*/managed-keys.bind* ns*/*.mkeys* diff --git a/bin/tests/system/rpzrecurse/ns1/named.conf.in b/bin/tests/system/rpzrecurse/ns1/named.conf.in index e8105a2e1f9..e5c87052d5d 100644 --- a/bin/tests/system/rpzrecurse/ns1/named.conf.in +++ b/bin/tests/system/rpzrecurse/ns1/named.conf.in @@ -19,6 +19,7 @@ options { listen-on { 10.53.0.1; }; listen-on-v6 { none; }; recursion no; + dnssec-validation no; querylog yes; }; diff --git a/bin/tests/system/rpzrecurse/ns2/named.clientip.conf b/bin/tests/system/rpzrecurse/ns2/named.clientip.conf index 8120a547afc..c8ef0aee43e 100644 --- a/bin/tests/system/rpzrecurse/ns2/named.clientip.conf +++ b/bin/tests/system/rpzrecurse/ns2/named.clientip.conf @@ -29,4 +29,7 @@ view "recursive" { # policy zones to be tested zone "clientip1" { type master; file "db.clientip1"; }; zone "clientip2" { type master; file "db.clientip2"; }; + + recursion yes; + dnssec-validation yes; }; diff --git a/bin/tests/system/rpzrecurse/ns2/named.clientip2.conf b/bin/tests/system/rpzrecurse/ns2/named.clientip2.conf index bfd0b692cb2..c3c61643264 100644 --- a/bin/tests/system/rpzrecurse/ns2/named.clientip2.conf +++ b/bin/tests/system/rpzrecurse/ns2/named.clientip2.conf @@ -29,4 +29,7 @@ view "recursive" { # policy zones to be tested zone "clientip21" { type master; file "db.clientip21"; }; + + recursion yes; + dnssec-validation yes; }; diff --git a/bin/tests/system/rpzrecurse/ns2/named.conf.header.in b/bin/tests/system/rpzrecurse/ns2/named.conf.header.in index 58a0dc9a643..68208208589 100644 --- a/bin/tests/system/rpzrecurse/ns2/named.conf.header.in +++ b/bin/tests/system/rpzrecurse/ns2/named.conf.header.in @@ -21,6 +21,7 @@ options { listen-on { 10.53.0.2; }; listen-on-v6 { none; }; recursion yes; + dnssec-validation yes; querylog yes; # let ns3 start dnsrpzd diff --git a/bin/tests/system/rpzrecurse/ns2/named.default.conf b/bin/tests/system/rpzrecurse/ns2/named.default.conf index f6904958942..b692926c633 100644 --- a/bin/tests/system/rpzrecurse/ns2/named.default.conf +++ b/bin/tests/system/rpzrecurse/ns2/named.default.conf @@ -17,4 +17,7 @@ view "recursive" { type hint; file "root.hint"; }; + + recursion yes; + dnssec-validation yes; }; diff --git a/bin/tests/system/rpzrecurse/ns2/named.log.conf b/bin/tests/system/rpzrecurse/ns2/named.log.conf index 731b97f6cfd..10c66a3e6c5 100644 --- a/bin/tests/system/rpzrecurse/ns2/named.log.conf +++ b/bin/tests/system/rpzrecurse/ns2/named.log.conf @@ -31,4 +31,7 @@ view "recursive" { zone "log1" { type master; file "db.log1"; }; zone "log2" { type master; file "db.log2"; }; zone "log3" { type master; file "db.log3"; }; + + recursion yes; + dnssec-validation yes; }; diff --git a/bin/tests/system/rpzrecurse/ns2/named.max.conf b/bin/tests/system/rpzrecurse/ns2/named.max.conf index f4a336801e1..a710793e231 100644 --- a/bin/tests/system/rpzrecurse/ns2/named.max.conf +++ b/bin/tests/system/rpzrecurse/ns2/named.max.conf @@ -153,4 +153,7 @@ view "recursive" { zone "max62" { type master; file "db.max62.local"; }; zone "max63" { type master; file "db.max63.local"; }; zone "max64" { type master; file "db.max64.local"; }; + + recursion yes; + dnssec-validation yes; }; diff --git a/bin/tests/system/rpzrecurse/ns2/named.wildcard1.conf b/bin/tests/system/rpzrecurse/ns2/named.wildcard1.conf index 91f06932586..963e3b0e8a5 100644 --- a/bin/tests/system/rpzrecurse/ns2/named.wildcard1.conf +++ b/bin/tests/system/rpzrecurse/ns2/named.wildcard1.conf @@ -27,4 +27,7 @@ view "recursive" { # policy zones to be tested zone "wildcard1" { type master; file "db.wildcard1"; }; + + recursion yes; + dnssec-validation yes; }; diff --git a/bin/tests/system/rpzrecurse/ns2/named.wildcard2.conf b/bin/tests/system/rpzrecurse/ns2/named.wildcard2.conf index a4e2dd5222a..f758b3a012f 100644 --- a/bin/tests/system/rpzrecurse/ns2/named.wildcard2.conf +++ b/bin/tests/system/rpzrecurse/ns2/named.wildcard2.conf @@ -29,4 +29,7 @@ view "recursive" { # policy zones to be tested zone "wildcard2a" { type master; file "db.wildcard2a"; }; zone "wildcard2b" { type master; file "db.wildcard2b"; }; + + recursion yes; + dnssec-validation yes; }; diff --git a/bin/tests/system/rpzrecurse/ns2/named.wildcard3.conf b/bin/tests/system/rpzrecurse/ns2/named.wildcard3.conf index e53aa4d88e5..bb8555cd047 100644 --- a/bin/tests/system/rpzrecurse/ns2/named.wildcard3.conf +++ b/bin/tests/system/rpzrecurse/ns2/named.wildcard3.conf @@ -27,4 +27,7 @@ view "recursive" { # policy zones to be tested zone "wildcard3" { type master; file "db.wildcard3"; }; + + recursion yes; + dnssec-validation yes; }; diff --git a/bin/tests/system/rpzrecurse/ns3/named1.conf.in b/bin/tests/system/rpzrecurse/ns3/named1.conf.in index 55b75b3eb23..957d911c8f7 100644 --- a/bin/tests/system/rpzrecurse/ns3/named1.conf.in +++ b/bin/tests/system/rpzrecurse/ns3/named1.conf.in @@ -25,6 +25,7 @@ options { listen-on { 10.53.0.3; }; listen-on-v6 { none; }; recursion yes; + dnssec-validation yes; response-policy { zone "policy"; } qname-wait-recurse yes nsip-enable yes diff --git a/bin/tests/system/rpzrecurse/ns3/named2.conf.in b/bin/tests/system/rpzrecurse/ns3/named2.conf.in index c554ec15d6f..961d2d2fb2f 100644 --- a/bin/tests/system/rpzrecurse/ns3/named2.conf.in +++ b/bin/tests/system/rpzrecurse/ns3/named2.conf.in @@ -24,6 +24,7 @@ options { listen-on { 10.53.0.3; }; listen-on-v6 { none; }; recursion yes; + dnssec-validation yes; response-policy { zone "policy"; } nsip-wait-recurse no qname-wait-recurse yes nsip-enable yes diff --git a/bin/tests/system/rpzrecurse/ns4/named.conf.in b/bin/tests/system/rpzrecurse/ns4/named.conf.in index 24e5115ae64..bcdbc97d602 100644 --- a/bin/tests/system/rpzrecurse/ns4/named.conf.in +++ b/bin/tests/system/rpzrecurse/ns4/named.conf.in @@ -21,6 +21,7 @@ options { listen-on { 10.53.0.4; }; listen-on-v6 { none; }; recursion no; + dnssec-validation no; }; zone "child.example.tld" { type master; file "child.example.db"; }; diff --git a/bin/tests/system/rrl/clean.sh b/bin/tests/system/rrl/clean.sh index 55a1c12b991..d42e4597bf3 100644 --- a/bin/tests/system/rrl/clean.sh +++ b/bin/tests/system/rrl/clean.sh @@ -15,3 +15,4 @@ rm -f ns3/bl*.db */*.jnl */*.core */*.pid rm -f ns*/named.lock rm -f ns*/named.conf rm -f broken.out +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/rrl/ns1/named.conf.in b/bin/tests/system/rrl/ns1/named.conf.in index 4605e46e3a7..2faa95c8be6 100644 --- a/bin/tests/system/rrl/ns1/named.conf.in +++ b/bin/tests/system/rrl/ns1/named.conf.in @@ -19,6 +19,8 @@ options { listen-on { 10.53.0.1; }; listen-on-v6 { none; }; notify no; + recursion yes; + dnssec-validation yes; }; zone "." {type master; file "root.db";}; diff --git a/bin/tests/system/rrl/ns2/named.conf.in b/bin/tests/system/rrl/ns2/named.conf.in index 6a506234f34..66ab0ed7700 100644 --- a/bin/tests/system/rrl/ns2/named.conf.in +++ b/bin/tests/system/rrl/ns2/named.conf.in @@ -20,6 +20,8 @@ options { listen-on { 10.53.0.2; }; listen-on-v6 { none; }; notify no; + recursion yes; + dnssec-validation yes; rate-limit { responses-per-second 2; diff --git a/bin/tests/system/rrl/ns3/named.conf.in b/bin/tests/system/rrl/ns3/named.conf.in index 5be45fac811..1bacc6bf88d 100644 --- a/bin/tests/system/rrl/ns3/named.conf.in +++ b/bin/tests/system/rrl/ns3/named.conf.in @@ -19,6 +19,8 @@ options { listen-on { 10.53.0.3; }; listen-on-v6 { none; }; notify no; + recursion yes; + dnssec-validation yes; // check that all of the options are parsed without limiting anything rate-limit { diff --git a/bin/tests/system/rrl/ns4/named.conf.in b/bin/tests/system/rrl/ns4/named.conf.in index 07383c32412..a3949397768 100644 --- a/bin/tests/system/rrl/ns4/named.conf.in +++ b/bin/tests/system/rrl/ns4/named.conf.in @@ -20,6 +20,8 @@ options { listen-on { 10.53.0.4; }; listen-on-v6 { none; }; notify no; + recursion yes; + dnssec-validation yes; rate-limit { responses-per-second 2; diff --git a/bin/tests/system/rrsetorder/clean.sh b/bin/tests/system/rrsetorder/clean.sh index 2e19c523b76..8c0ded89a50 100644 --- a/bin/tests/system/rrsetorder/clean.sh +++ b/bin/tests/system/rrsetorder/clean.sh @@ -18,3 +18,4 @@ rm -f ns?/named.run ns?/named.core rm -f */named.memstats rm -f ns*/named.lock rm -f ns*/named.conf +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/rrsetorder/ns1/named.conf.in b/bin/tests/system/rrsetorder/ns1/named.conf.in index e3430f7c874..6e009f48353 100644 --- a/bin/tests/system/rrsetorder/ns1/named.conf.in +++ b/bin/tests/system/rrsetorder/ns1/named.conf.in @@ -18,6 +18,7 @@ options { listen-on { 10.53.0.1; }; listen-on-v6 { none; }; recursion no; + dnssec-validation no; notify no; rrset-order { name "fixed.example" order fixed; diff --git a/bin/tests/system/rrsetorder/ns2/named.conf.in b/bin/tests/system/rrsetorder/ns2/named.conf.in index ae7eb9592f9..2f13d66c717 100644 --- a/bin/tests/system/rrsetorder/ns2/named.conf.in +++ b/bin/tests/system/rrsetorder/ns2/named.conf.in @@ -18,8 +18,8 @@ options { listen-on { 10.53.0.2; }; listen-on-v6 { none; }; recursion no; + dnssec-validation no; notify yes; - // flush-zones-on-shutdown yes; rrset-order { name "fixed.example" order fixed; name "random.example" order random; diff --git a/bin/tests/system/rrsetorder/ns3/named.conf.in b/bin/tests/system/rrsetorder/ns3/named.conf.in index 14153dfb0ee..7343a7e6188 100644 --- a/bin/tests/system/rrsetorder/ns3/named.conf.in +++ b/bin/tests/system/rrsetorder/ns3/named.conf.in @@ -18,6 +18,7 @@ options { listen-on { 10.53.0.3; }; listen-on-v6 { none; }; recursion yes; + dnssec-validation yes; notify yes; rrset-order { name "fixed.example" order fixed; diff --git a/bin/tests/system/rrsetorder/ns4/named.conf.in b/bin/tests/system/rrsetorder/ns4/named.conf.in index 09de24d741a..d76b71d7d1d 100644 --- a/bin/tests/system/rrsetorder/ns4/named.conf.in +++ b/bin/tests/system/rrsetorder/ns4/named.conf.in @@ -18,6 +18,7 @@ options { listen-on { 10.53.0.4; }; listen-on-v6 { none; }; recursion yes; + dnssec-validation yes; notify yes; rrset-order { class IN type A name "host.example.com" order random; diff --git a/bin/tests/system/rsabigexponent/clean.sh b/bin/tests/system/rsabigexponent/clean.sh index bba0f1177de..103fff0cb08 100644 --- a/bin/tests/system/rsabigexponent/clean.sh +++ b/bin/tests/system/rsabigexponent/clean.sh @@ -18,3 +18,4 @@ rm -f ns2/signer.err rm -f dig.out.* rm -f ns*/named.lock rm -f ns*/named.conf +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/runtime/clean.sh b/bin/tests/system/runtime/clean.sh index a2345248f9d..1be52649b00 100644 --- a/bin/tests/system/runtime/clean.sh +++ b/bin/tests/system/runtime/clean.sh @@ -17,3 +17,4 @@ rm -f *.pid rm -f rndc.out* [ -d ns2/nope ] && chmod 755 ns2/nope rm -rf ns2/nope +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/serve-stale/clean.sh b/bin/tests/system/serve-stale/clean.sh index 1e3d07eb8d0..80469ef1ff8 100644 --- a/bin/tests/system/serve-stale/clean.sh +++ b/bin/tests/system/serve-stale/clean.sh @@ -13,3 +13,4 @@ rm -f ns3/named.conf rm -f ns3/root.bk rm -f rndc.out.test* rm -f */named.run */named.memstats +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/sfcache/clean.sh b/bin/tests/system/sfcache/clean.sh index e3e47ab857c..d1e0b5303c0 100644 --- a/bin/tests/system/sfcache/clean.sh +++ b/bin/tests/system/sfcache/clean.sh @@ -18,3 +18,4 @@ rm -f dig.* rm -f sfcache.* rm -f ns*/named.lock rm -f ns5/named.run.part* +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/sortlist/clean.sh b/bin/tests/system/sortlist/clean.sh index e9102915a5b..0a09cf21ab3 100644 --- a/bin/tests/system/sortlist/clean.sh +++ b/bin/tests/system/sortlist/clean.sh @@ -14,3 +14,4 @@ rm -f */named.memstats rm -f */named.run rm -f */named.conf rm -f ns*/named.lock +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/spf/clean.sh b/bin/tests/system/spf/clean.sh index df9a329b846..54086d17cd8 100644 --- a/bin/tests/system/spf/clean.sh +++ b/bin/tests/system/spf/clean.sh @@ -11,3 +11,4 @@ rm -f ns1/named.run rm -f ns1/named.memstats rm -f ns*/named.lock rm -f ns*/named.conf +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/staticstub/clean.sh b/bin/tests/system/staticstub/clean.sh index 52c25cd96e2..4e0eecd6bda 100755 --- a/bin/tests/system/staticstub/clean.sh +++ b/bin/tests/system/staticstub/clean.sh @@ -23,3 +23,4 @@ rm -rf */*.signed rm -rf */K* rm -rf */dsset-* rm -rf */trusted.conf +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/staticstub/ns1/named.conf.in b/bin/tests/system/staticstub/ns1/named.conf.in index 4f317551853..f251b17b0b8 100644 --- a/bin/tests/system/staticstub/ns1/named.conf.in +++ b/bin/tests/system/staticstub/ns1/named.conf.in @@ -16,6 +16,7 @@ options { listen-on { 10.53.0.1; }; listen-on-v6 { none; }; recursion no; + dnssec-validation no; notify no; }; diff --git a/bin/tests/system/staticstub/ns2/named.conf.in b/bin/tests/system/staticstub/ns2/named.conf.in index 245c7c2a5b2..c3ae03c4d24 100644 --- a/bin/tests/system/staticstub/ns2/named.conf.in +++ b/bin/tests/system/staticstub/ns2/named.conf.in @@ -29,6 +29,7 @@ options { listen-on { 10.53.0.2; }; listen-on-v6 { none; }; recursion yes; + dnssec-validation yes; notify no; }; diff --git a/bin/tests/system/staticstub/ns3/named.conf.in b/bin/tests/system/staticstub/ns3/named.conf.in index b58219652e4..8f76cedce50 100644 --- a/bin/tests/system/staticstub/ns3/named.conf.in +++ b/bin/tests/system/staticstub/ns3/named.conf.in @@ -27,6 +27,7 @@ options { listen-on { 10.53.0.3; }; listen-on-v6 { none; }; recursion no; + dnssec-validation no; notify no; }; diff --git a/bin/tests/system/staticstub/ns4/named.conf.in b/bin/tests/system/staticstub/ns4/named.conf.in index b3a82c9e99d..6ad8b20407b 100644 --- a/bin/tests/system/staticstub/ns4/named.conf.in +++ b/bin/tests/system/staticstub/ns4/named.conf.in @@ -18,6 +18,7 @@ options { listen-on { 10.53.0.4; }; listen-on-v6 { ::1; }; recursion no; + dnssec-validation no; notify no; }; diff --git a/bin/tests/system/statistics/clean.sh b/bin/tests/system/statistics/clean.sh index 830c835b634..c730331031b 100644 --- a/bin/tests/system/statistics/clean.sh +++ b/bin/tests/system/statistics/clean.sh @@ -24,3 +24,4 @@ rm -f dig.out* rm -f curl.out.* rm -f ns*/named.lock rm -f stats*out +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/statistics/ns1/named.conf.in b/bin/tests/system/statistics/ns1/named.conf.in index 762b0fdf9d5..9bccd3c0639 100644 --- a/bin/tests/system/statistics/ns1/named.conf.in +++ b/bin/tests/system/statistics/ns1/named.conf.in @@ -18,6 +18,7 @@ options { listen-on { 10.53.0.1; }; listen-on-v6 { none; }; recursion no; + dnssec-validation no; notify yes; }; diff --git a/bin/tests/system/statistics/ns2/named.conf.in b/bin/tests/system/statistics/ns2/named.conf.in index c046fe9e827..be8b1e3e53b 100644 --- a/bin/tests/system/statistics/ns2/named.conf.in +++ b/bin/tests/system/statistics/ns2/named.conf.in @@ -18,6 +18,7 @@ options { listen-on { 10.53.0.2; }; listen-on-v6 { none; }; recursion yes; + dnssec-validation yes; notify yes; }; diff --git a/bin/tests/system/statistics/ns3/named.conf.in b/bin/tests/system/statistics/ns3/named.conf.in index fe07cead950..67d041b67a2 100644 --- a/bin/tests/system/statistics/ns3/named.conf.in +++ b/bin/tests/system/statistics/ns3/named.conf.in @@ -19,6 +19,7 @@ options { listen-on { 10.53.0.3; }; listen-on-v6 { none; }; recursion yes; + dnssec-validation yes; notify yes; }; diff --git a/bin/tests/system/statschannel/clean.sh b/bin/tests/system/statschannel/clean.sh index 58eaaf86895..224e14f76f9 100644 --- a/bin/tests/system/statschannel/clean.sh +++ b/bin/tests/system/statschannel/clean.sh @@ -19,3 +19,4 @@ rm -f ns*/named.stats rm -f xml.*stats json.*stats rm -f xml.*mem json.*mem rm -f compressed.headers regular.headers compressed.out regular.out +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/stress/clean.sh b/bin/tests/system/stress/clean.sh index 3d13acd14e6..21965163a42 100644 --- a/bin/tests/system/stress/clean.sh +++ b/bin/tests/system/stress/clean.sh @@ -20,3 +20,4 @@ rm -f ns2/zone0*.db rm -f ns2/zone0*.jnl rm -f */named.memstats rm -f ns*/named.lock +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/stress/ns1/named.conf b/bin/tests/system/stress/ns1/named.conf index 59690e799e1..d551eaf83de 100644 --- a/bin/tests/system/stress/ns1/named.conf +++ b/bin/tests/system/stress/ns1/named.conf @@ -20,6 +20,7 @@ options { listen-on { 10.53.0.1; }; listen-on-v6 { none; }; recursion no; + dnssec-validation no; notify yes; }; diff --git a/bin/tests/system/stress/ns2/named.conf b/bin/tests/system/stress/ns2/named.conf index c0fb05f51f8..c6163a2a63a 100644 --- a/bin/tests/system/stress/ns2/named.conf +++ b/bin/tests/system/stress/ns2/named.conf @@ -20,6 +20,7 @@ options { listen-on { 10.53.0.2; }; listen-on-v6 { none; }; recursion no; + dnssec-validation no; notify yes; }; diff --git a/bin/tests/system/stress/ns3/named.conf b/bin/tests/system/stress/ns3/named.conf index 5c67d066ffd..021d3b3e9ab 100644 --- a/bin/tests/system/stress/ns3/named.conf +++ b/bin/tests/system/stress/ns3/named.conf @@ -20,6 +20,7 @@ options { listen-on { 10.53.0.3; }; listen-on-v6 { none; }; recursion yes; + dnssec-validation yes; notify yes; }; diff --git a/bin/tests/system/stress/ns4/named.conf b/bin/tests/system/stress/ns4/named.conf index 65b5b164193..d4cfa244133 100644 --- a/bin/tests/system/stress/ns4/named.conf +++ b/bin/tests/system/stress/ns4/named.conf @@ -20,6 +20,7 @@ options { listen-on { 10.53.0.4; }; listen-on-v6 { none; }; recursion yes; + dnssec-validation yes; notify yes; }; diff --git a/bin/tests/system/stub/clean.sh b/bin/tests/system/stub/clean.sh index d5698ef8c06..46c74595735 100644 --- a/bin/tests/system/stub/clean.sh +++ b/bin/tests/system/stub/clean.sh @@ -17,3 +17,4 @@ rm -f */named.memstats rm -f */named.conf rm -f */named.run rm -f ns*/named.lock +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/synthfromdnssec/clean.sh b/bin/tests/system/synthfromdnssec/clean.sh index d56a5315453..1e6e164c120 100644 --- a/bin/tests/system/synthfromdnssec/clean.sh +++ b/bin/tests/system/synthfromdnssec/clean.sh @@ -20,3 +20,4 @@ rm -f ns1/root.db rm -f ns1/root.db.signed rm -f ns1/trusted.conf rm -f ns2/named_dump.db +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/tcp/clean.sh b/bin/tests/system/tcp/clean.sh index 5fb4f9be1a3..3c9a05e2257 100644 --- a/bin/tests/system/tcp/clean.sh +++ b/bin/tests/system/tcp/clean.sh @@ -15,3 +15,4 @@ rm -f */named.conf rm -f */named.stats rm -f dig.out* rm -f ns*/named.lock +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/tkey/clean.sh b/bin/tests/system/tkey/clean.sh index a8ea8cf4758..cf1557927ed 100644 --- a/bin/tests/system/tkey/clean.sh +++ b/bin/tests/system/tkey/clean.sh @@ -15,3 +15,4 @@ rm -f */named.memstats rm -f */named.run rm -f ns1/_default.tsigkeys rm -f ns*/named.lock +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/tsig/clean.sh b/bin/tests/system/tsig/clean.sh index 5fdbb7d8483..38505bcaf62 100644 --- a/bin/tests/system/tsig/clean.sh +++ b/bin/tests/system/tsig/clean.sh @@ -20,3 +20,4 @@ rm -f */named.run rm -f ns*/named.lock rm -f Kexample.net.* rm -f keygen.out? +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/tsiggss/clean.sh b/bin/tests/system/tsiggss/clean.sh index c97ade76514..9a2240547c6 100644 --- a/bin/tests/system/tsiggss/clean.sh +++ b/bin/tests/system/tsiggss/clean.sh @@ -23,3 +23,4 @@ rm -f authsock.pid rm -f ns1/core rm -f nsupdate.out rm -f ns*/named.lock +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/unknown/clean.sh b/bin/tests/system/unknown/clean.sh index 8d734fae667..ddb0ab0bee6 100644 --- a/bin/tests/system/unknown/clean.sh +++ b/bin/tests/system/unknown/clean.sh @@ -17,3 +17,4 @@ rm -f */*.bk rm -f */*.bk.* rm -f ns3/Kexample.* rm -f ns*/named.lock +rm -f ns*/managed-keys.bind* ns*/*.mkeys* diff --git a/bin/tests/system/upforwd/clean.sh b/bin/tests/system/upforwd/clean.sh index d6222042eb6..8224172b274 100644 --- a/bin/tests/system/upforwd/clean.sh +++ b/bin/tests/system/upforwd/clean.sh @@ -24,3 +24,4 @@ rm -f Ksig0.example2.* rm -f keyname rm -f ns*/named.lock rm -f ns1/example2.db +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/views/clean.sh b/bin/tests/system/views/clean.sh index 3fbb4b0b4ef..98bde30199d 100644 --- a/bin/tests/system/views/clean.sh +++ b/bin/tests/system/views/clean.sh @@ -29,3 +29,4 @@ rm -f ns2/internal/inline.db.signed rm -f ns2/internal/inline.db.signed.jnl rm -f dig.out.external dig.out.internal rm -f ns*/named.lock +rm -f ns*/managed-keys.bind* ns*/*.mkeys* diff --git a/bin/tests/system/wildcard/clean.sh b/bin/tests/system/wildcard/clean.sh index 8f99328904d..ecd1e10db1a 100644 --- a/bin/tests/system/wildcard/clean.sh +++ b/bin/tests/system/wildcard/clean.sh @@ -23,3 +23,4 @@ rm -f ns1/signer.err rm -f */named.memstats rm -f dig.out.ns*.test* rm -f ns*/named.lock +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/wildcard/ns1/named.conf.in b/bin/tests/system/wildcard/ns1/named.conf.in index e02ee67d2a1..3a54d275cdc 100644 --- a/bin/tests/system/wildcard/ns1/named.conf.in +++ b/bin/tests/system/wildcard/ns1/named.conf.in @@ -18,6 +18,7 @@ options { listen-on { 10.53.0.1; }; listen-on-v6 { none; }; recursion no; + dnssec-validation no; notify yes; dnssec-enable yes; }; diff --git a/bin/tests/system/wildcard/ns2/named.conf.in b/bin/tests/system/wildcard/ns2/named.conf.in index 67a50fcbc05..3a32a159561 100644 --- a/bin/tests/system/wildcard/ns2/named.conf.in +++ b/bin/tests/system/wildcard/ns2/named.conf.in @@ -18,6 +18,7 @@ options { listen-on { 10.53.0.2; }; listen-on-v6 { none; }; recursion yes; + dnssec-validation no; notify yes; }; diff --git a/bin/tests/system/wildcard/ns3/named.conf.in b/bin/tests/system/wildcard/ns3/named.conf.in index ad908a4cc78..879d08f70ca 100644 --- a/bin/tests/system/wildcard/ns3/named.conf.in +++ b/bin/tests/system/wildcard/ns3/named.conf.in @@ -18,6 +18,7 @@ options { listen-on { 10.53.0.3; }; listen-on-v6 { none; }; recursion yes; + dnssec-validation yes; notify yes; }; diff --git a/bin/tests/system/wildcard/ns4/named.conf.in b/bin/tests/system/wildcard/ns4/named.conf.in index 0b432c059b9..94c5344805d 100644 --- a/bin/tests/system/wildcard/ns4/named.conf.in +++ b/bin/tests/system/wildcard/ns4/named.conf.in @@ -18,6 +18,7 @@ options { listen-on { 10.53.0.4; }; listen-on-v6 { none; }; recursion yes; + dnssec-validation yes; notify yes; forward only; forwarders { 10.53.0.2; }; diff --git a/bin/tests/system/wildcard/ns5/named.conf.in b/bin/tests/system/wildcard/ns5/named.conf.in index 9ef24c73ea6..efe63a70307 100644 --- a/bin/tests/system/wildcard/ns5/named.conf.in +++ b/bin/tests/system/wildcard/ns5/named.conf.in @@ -18,6 +18,7 @@ options { listen-on { 10.53.0.5; }; listen-on-v6 { none; }; recursion yes; + dnssec-validation yes; notify yes; dnssec-lookaside . trust-anchor dlv; }; diff --git a/bin/tests/system/xfer/clean.sh b/bin/tests/system/xfer/clean.sh index aac849baa9c..10ff41a84f6 100644 --- a/bin/tests/system/xfer/clean.sh +++ b/bin/tests/system/xfer/clean.sh @@ -33,3 +33,4 @@ rm -f ns*/named.lock rm -f ns2/mapped.db rm -f ns3/mapped.bk rm -f ns1/ixfr-too-big.db ns1/ixfr-too-big.db.jnl +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/xferquota/clean.sh b/bin/tests/system/xferquota/clean.sh index e823c9179e3..eb2e78c726a 100644 --- a/bin/tests/system/xferquota/clean.sh +++ b/bin/tests/system/xferquota/clean.sh @@ -21,3 +21,4 @@ rm -f */named.memstats rm -f */named.conf rm -f */named.run rm -f ns*/named.lock +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/zero/clean.sh b/bin/tests/system/zero/clean.sh index 00fc10a0326..0f30776372f 100644 --- a/bin/tests/system/zero/clean.sh +++ b/bin/tests/system/zero/clean.sh @@ -15,3 +15,4 @@ rm -f ns4/example.bk rm -f dig.out* rm -f query.list rm -f ns*/named.lock +rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/zero/ns1/named.conf.in b/bin/tests/system/zero/ns1/named.conf.in index b24ceaa28dd..f5ae6ee4fdc 100644 --- a/bin/tests/system/zero/ns1/named.conf.in +++ b/bin/tests/system/zero/ns1/named.conf.in @@ -18,6 +18,7 @@ options { listen-on { 10.53.0.1; }; listen-on-v6 { none; }; recursion no; + dnssec-validation no; }; zone "." { diff --git a/bin/tests/system/zero/ns2/named.conf.in b/bin/tests/system/zero/ns2/named.conf.in index b0f237ab25f..671efcc6fe7 100644 --- a/bin/tests/system/zero/ns2/named.conf.in +++ b/bin/tests/system/zero/ns2/named.conf.in @@ -18,6 +18,7 @@ options { listen-on { 10.53.0.2; }; listen-on-v6 { none; }; recursion no; + dnssec-validation no; }; zone "example" { diff --git a/bin/tests/system/zero/ns3/named.conf.in b/bin/tests/system/zero/ns3/named.conf.in index 4036dd9efc0..aa35d03fc56 100644 --- a/bin/tests/system/zero/ns3/named.conf.in +++ b/bin/tests/system/zero/ns3/named.conf.in @@ -18,6 +18,7 @@ options { listen-on { 10.53.0.3; }; listen-on-v6 { none; }; recursion yes; + dnssec-validation yes; }; zone "." { diff --git a/bin/tests/system/zero/ns4/named.conf.in b/bin/tests/system/zero/ns4/named.conf.in index 00be8eca83e..2fc72b67250 100644 --- a/bin/tests/system/zero/ns4/named.conf.in +++ b/bin/tests/system/zero/ns4/named.conf.in @@ -18,6 +18,7 @@ options { listen-on { 10.53.0.4; }; listen-on-v6 { none; }; recursion no; + dnssec-validation yes; }; zone "example" { diff --git a/bin/tests/system/zonechecks/clean.sh b/bin/tests/system/zonechecks/clean.sh index 16cad7a876d..5eb10437bd1 100644 --- a/bin/tests/system/zonechecks/clean.sh +++ b/bin/tests/system/zonechecks/clean.sh @@ -17,3 +17,4 @@ rm -f */*.db */*.db.signed */K*.key */K*.private */*.jnl */dsset-* rm -f */signer.err rm -f rndc.out.* rm -f ns*/named.lock +rm -f ns*/managed-keys.bind* ns*/*.mkeys*