Use trust anchors with 'dnssec-validation yes' in system tests

Explicitly use an empty 'trust-anchors' statement in the system
tests where it was used implicitly before.

In resolver/ns5/named.conf.in use the trust anchor in 'trusted.conf',
which was supposed to be used there.

diff --git a/bin/tests/system/additional/ns3/named.conf.in b/bin/tests/system/additional/ns3/named.conf.in
index 2bd01c945d646995610e9e0b2a18f506c0860337..f47a3806289fd386e9a55e23d88ca15d9b1c7e24 100644 (file)
--- a/bin/tests/system/additional/ns3/named.conf.in
+++ b/bin/tests/system/additional/ns3/named.conf.in
@@ -26,6 +26,8 @@ options {
        minimal-responses no;
 };
 
+trust-anchors { };
+
 zone "." {
        type hint;
        file "root.hint";

diff --git a/bin/tests/system/cacheclean/ns2/named.conf.in b/bin/tests/system/cacheclean/ns2/named.conf.in
index 6ffa0737b22e3f21bb6c6c26486fbb8a7dd9b8b9..418209cf04dd6a393dd041ec0612609101c0713f 100644 (file)
--- a/bin/tests/system/cacheclean/ns2/named.conf.in
+++ b/bin/tests/system/cacheclean/ns2/named.conf.in
@@ -25,6 +25,8 @@ options {
        dnssec-validation yes;
 };
 
+trust-anchors { };
+
 key rndc_key {
        secret "1234abcd8765";
        algorithm @DEFAULT_HMAC@;

diff --git a/bin/tests/system/chain/ns1/named.conf.in b/bin/tests/system/chain/ns1/named.conf.in
index 550426126f3d24421d9ad0ab7601168c1e5df9d6..95ccf892063cb2efe83e002d7e72aa07ac77c2d6 100644 (file)
--- a/bin/tests/system/chain/ns1/named.conf.in
+++ b/bin/tests/system/chain/ns1/named.conf.in
@@ -24,4 +24,6 @@ options {
        notify yes;
 };
 
+trust-anchors { };
+
 zone "." { type primary; file "root.db"; };

diff --git a/bin/tests/system/chain/ns7/named.conf.in b/bin/tests/system/chain/ns7/named.conf.in
index 32c9b5f56997f36dfd7d396d0003479ad2005dca..87931179d2285df199219ae5628ee977ff4fe9a8 100644 (file)
--- a/bin/tests/system/chain/ns7/named.conf.in
+++ b/bin/tests/system/chain/ns7/named.conf.in
@@ -30,6 +30,8 @@ options {
        };
 };
 
+trust-anchors { };
+
 key rndc_key {
        secret "1234abcd8765";
        algorithm @DEFAULT_HMAC@;

diff --git a/bin/tests/system/checknames/ns2/named.conf.in b/bin/tests/system/checknames/ns2/named.conf.in
index 3ba62e1a8d229b51614eb37de9f87496117927fc..105a88dd5f24f1d7eca10cc9a0ca3ac1c43e94f3 100644 (file)
--- a/bin/tests/system/checknames/ns2/named.conf.in
+++ b/bin/tests/system/checknames/ns2/named.conf.in
@@ -25,6 +25,8 @@ options {
        notify yes;
 };
 
+trust-anchors { };
+
 zone "." {
        type hint;
        file "root.hints";

diff --git a/bin/tests/system/checknames/ns3/named.conf.in b/bin/tests/system/checknames/ns3/named.conf.in
index 7c0cacb5aeb9c482451cbbdbe01649a88f2cff19..487cecca282e60ccc4b8836367afec63f17ae61b 100644 (file)
--- a/bin/tests/system/checknames/ns3/named.conf.in
+++ b/bin/tests/system/checknames/ns3/named.conf.in
@@ -25,6 +25,8 @@ options {
        notify yes;
 };
 
+trust-anchors { };
+
 zone "." {
        type hint;
        file "root.hints";

diff --git a/bin/tests/system/checknames/ns4/named.conf.in b/bin/tests/system/checknames/ns4/named.conf.in
index f0cb87093bf4272d7828054298e52e8a3b6cbff9..841bb5904eccd2c661162897219712f90977f27b 100644 (file)
--- a/bin/tests/system/checknames/ns4/named.conf.in
+++ b/bin/tests/system/checknames/ns4/named.conf.in
@@ -26,6 +26,8 @@ options {
        notify yes;
 };
 
+trust-anchors { };
+
 zone "." {
        type hint;
        file "root.hints";

diff --git a/bin/tests/system/checknames/ns5/named.conf.in b/bin/tests/system/checknames/ns5/named.conf.in
index 1797aa1eb2165e33c188a4a173ec01ffba149e2a..dec85ec498c6a9079b4a85c5a4e18b7e463c099e 100644 (file)
--- a/bin/tests/system/checknames/ns5/named.conf.in
+++ b/bin/tests/system/checknames/ns5/named.conf.in
@@ -26,6 +26,8 @@ options {
        notify yes;
 };
 
+trust-anchors { };
+
 zone "." {
        type hint;
        file "root.hints";

diff --git a/bin/tests/system/cipher-suites/ns1/named.conf.in b/bin/tests/system/cipher-suites/ns1/named.conf.in
index 77186a6e63f461238653165030fc10ae6e22080e..8de44d1cb48e07f500a3169bb8d902abe9bc1a28 100644 (file)
--- a/bin/tests/system/cipher-suites/ns1/named.conf.in
+++ b/bin/tests/system/cipher-suites/ns1/named.conf.in
@@ -69,6 +69,8 @@ options {
        transfers-out 100;
 };
 
+trust-anchors { };
+
 zone "." {
        type primary;
        file "root.db";

diff --git a/bin/tests/system/cipher-suites/ns2/named.conf.in b/bin/tests/system/cipher-suites/ns2/named.conf.in
index 58189524b87f29cf590738bdfaec91c62eac70f3..c81429c90258f43ae72a387c79c299a4479fb12e 100644 (file)
--- a/bin/tests/system/cipher-suites/ns2/named.conf.in
+++ b/bin/tests/system/cipher-suites/ns2/named.conf.in
@@ -39,6 +39,8 @@ options {
        dnssec-validation yes;
 };
 
+trust-anchors { };
+
 zone "." {
        type hint;
        file "../../_common/root.hint";

diff --git a/bin/tests/system/cipher-suites/ns3/named.conf.in b/bin/tests/system/cipher-suites/ns3/named.conf.in
index 9a78903d983e4604ac58eb69c254813890a7f6b1..ab642f92cef5784ceab6978dddd7f29151d4aaf1 100644 (file)
--- a/bin/tests/system/cipher-suites/ns3/named.conf.in
+++ b/bin/tests/system/cipher-suites/ns3/named.conf.in
@@ -39,6 +39,8 @@ options {
        dnssec-validation yes;
 };
 
+trust-anchors { };
+
 zone "." {
        type hint;
        file "../../_common/root.hint";

diff --git a/bin/tests/system/cipher-suites/ns4/named.conf.in b/bin/tests/system/cipher-suites/ns4/named.conf.in
index cf52f98b0da503aab2a6844dd84fdc610c1a3c38..a690cf5c783ab486f9d6ad8494a7aaa91284aa11 100644 (file)
--- a/bin/tests/system/cipher-suites/ns4/named.conf.in
+++ b/bin/tests/system/cipher-suites/ns4/named.conf.in
@@ -39,6 +39,8 @@ options {
        dnssec-validation yes;
 };
 
+trust-anchors { };
+
 zone "." {
        type hint;
        file "../../_common/root.hint";

diff --git a/bin/tests/system/cipher-suites/ns5/named.conf.in b/bin/tests/system/cipher-suites/ns5/named.conf.in
index 9187d0e94a4a6a6ecc1501f936e5aa6fe4815bcf..c36b374a19ec5cf3825697acfa8516a6e85a74e5 100644 (file)
--- a/bin/tests/system/cipher-suites/ns5/named.conf.in
+++ b/bin/tests/system/cipher-suites/ns5/named.conf.in
@@ -39,6 +39,8 @@ options {
        dnssec-validation yes;
 };
 
+trust-anchors { };
+
 zone "." {
        type hint;
        file "../../_common/root.hint";

diff --git a/bin/tests/system/cookie/ns1/named.conf.in b/bin/tests/system/cookie/ns1/named.conf.in
index 20ebca30c0f586ec3f2e7537d0e2132d39c702f0..0bd93c93de15a809b6250d6714ba2c3d60fb1155 100644 (file)
--- a/bin/tests/system/cookie/ns1/named.conf.in
+++ b/bin/tests/system/cookie/ns1/named.conf.in
@@ -49,6 +49,8 @@ options {
        nocookie-udp-size 512;
 };
 
+trust-anchors { };
+
 zone "." {
        type hint;
        file "root.hint";

diff --git a/bin/tests/system/cookie/ns3/named.conf.in b/bin/tests/system/cookie/ns3/named.conf.in
index 090d528ba31aabd0c7e1a7cd29f96e87352fafb5..cbebd0743317fe051c9ac301454fbd9e9c63b502 100644 (file)
--- a/bin/tests/system/cookie/ns3/named.conf.in
+++ b/bin/tests/system/cookie/ns3/named.conf.in
@@ -41,6 +41,8 @@ options {
        require-server-cookie yes;
 };
 
+trust-anchors { };
+
 zone "." {
        type hint;
        file "root.hint";

diff --git a/bin/tests/system/cookie/ns4/named.conf.in b/bin/tests/system/cookie/ns4/named.conf.in
index c49b87ec10ae274d9303d64acee90bd422db9fbb..592be13ed072e6a2fcba01340f16729b4fd88894 100644 (file)
--- a/bin/tests/system/cookie/ns4/named.conf.in
+++ b/bin/tests/system/cookie/ns4/named.conf.in
@@ -35,6 +35,8 @@ options {
        require-server-cookie yes;
 };
 
+trust-anchors { };
+
 zone "." {
        type hint;
        file "root.hint";

diff --git a/bin/tests/system/cookie/ns5/named.conf.in b/bin/tests/system/cookie/ns5/named.conf.in
index 87210adbf8b5c8dfab41970b398d1928d90c8178..2f51e1be944145c33763e604d35f94b9356537c8 100644 (file)
--- a/bin/tests/system/cookie/ns5/named.conf.in
+++ b/bin/tests/system/cookie/ns5/named.conf.in
@@ -36,6 +36,8 @@ options {
        require-server-cookie yes;
 };
 
+trust-anchors { };
+
 zone "." {
        type hint;
        file "root.hint";

diff --git a/bin/tests/system/cookie/ns6/named.conf.in b/bin/tests/system/cookie/ns6/named.conf.in
index 158d8988c5f7c3c838c75b15511502c1ecf022c9..56c5e048579f9595abe3a0f5f50dcd37d31f9ad8 100644 (file)
--- a/bin/tests/system/cookie/ns6/named.conf.in
+++ b/bin/tests/system/cookie/ns6/named.conf.in
@@ -35,6 +35,8 @@ options {
        require-server-cookie yes;
 };
 
+trust-anchors { };
+
 zone "." {
        type hint;
        file "root.hint";

diff --git a/bin/tests/system/cookie/ns8/named.conf.in b/bin/tests/system/cookie/ns8/named.conf.in
index 693f06a81edc93fc4863e4eb90ea0fdeb6ccde7f..36f052b8e40d2d9a4b567f677f8c4db1faf3f040 100644 (file)
--- a/bin/tests/system/cookie/ns8/named.conf.in
+++ b/bin/tests/system/cookie/ns8/named.conf.in
@@ -33,6 +33,8 @@ options {
        require-server-cookie yes;
 };
 
+trust-anchors { };
+
 server 10.53.0.7 { require-cookie yes; };
 
 zone "example" {

diff --git a/bin/tests/system/database/ns1/named1.conf.in b/bin/tests/system/database/ns1/named1.conf.in
index 5fa7ce5ce4df4f4c984e42eb344240e3b4657279..97c087fccd140373fe227a25d32bae456f29b4eb 100644 (file)
--- a/bin/tests/system/database/ns1/named1.conf.in
+++ b/bin/tests/system/database/ns1/named1.conf.in
@@ -35,6 +35,8 @@ options {
        dnssec-validation yes;
 };
 
+trust-anchors { };
+
 zone "database" {
        type primary;
        database "_builtin empty localhost. hostmaster.isc.org.";

diff --git a/bin/tests/system/database/ns1/named2.conf.in b/bin/tests/system/database/ns1/named2.conf.in
index 80cfab28b88c1dfe75838692e7e3a59a15d03e66..8c498a9ae1513864f76ef6dd9cd3ef0d35e0ca1e 100644 (file)
--- a/bin/tests/system/database/ns1/named2.conf.in
+++ b/bin/tests/system/database/ns1/named2.conf.in
@@ -35,6 +35,8 @@ options {
        dnssec-validation yes;
 };
 
+trust-anchors { };
+
 zone "database" {
        type primary;
        database "_builtin empty localhost. marka.isc.org.";

diff --git a/bin/tests/system/dns64/ns1/named.conf1.in b/bin/tests/system/dns64/ns1/named.conf1.in
index 41950d9f64de84c952274386817f8bb4f320400c..bc6c2d23661a446da8b2c974e43afd4a2b3166a1 100644 (file)
--- a/bin/tests/system/dns64/ns1/named.conf1.in
+++ b/bin/tests/system/dns64/ns1/named.conf1.in
@@ -42,6 +42,8 @@ options {
        };
 };
 
+trust-anchors { };
+
 zone "." {
        type primary;
        file "root.db";

diff --git a/bin/tests/system/dns64/ns1/named.conf2.in b/bin/tests/system/dns64/ns1/named.conf2.in
index ff39dd1fb63585407a1bbf57786c9171c2e2e0f6..d7a6d1f80a490abba4a4d0b638db4ede097ec73b 100644 (file)
--- a/bin/tests/system/dns64/ns1/named.conf2.in
+++ b/bin/tests/system/dns64/ns1/named.conf2.in
@@ -45,6 +45,8 @@ options {
        };
 };
 
+trust-anchors { };
+
 zone "." {
        type primary;
        file "root.db";

diff --git a/bin/tests/system/dns64/ns1/named.conf3.in b/bin/tests/system/dns64/ns1/named.conf3.in
index a44c258cc3e915e4d0d83cecd44b1076f0d2a066..393e623b366f8c70e5a317907ecca0296abec3ae 100644 (file)
--- a/bin/tests/system/dns64/ns1/named.conf3.in
+++ b/bin/tests/system/dns64/ns1/named.conf3.in
@@ -34,6 +34,8 @@ options {
        dnssec-validation yes;
 };
 
+trust-anchors { };
+
 zone "." {
        type primary;
        file "root.db";

diff --git a/bin/tests/system/dns64/ns2/named.conf.in b/bin/tests/system/dns64/ns2/named.conf.in
index 263cc8a1b1b07c435af24058bb1ef3189fa7b3ae..49299aaf997e7b8b85ee4bf8dc791cc7c0b41250 100644 (file)
--- a/bin/tests/system/dns64/ns2/named.conf.in
+++ b/bin/tests/system/dns64/ns2/named.conf.in
@@ -60,6 +60,8 @@ options {
        response-policy { zone "rpz"; };
 };
 
+trust-anchors { };
+
 zone "." {
        type hint;
        file "../../_common/root.hint";

diff --git a/bin/tests/system/dns64/ns3/named.conf.in b/bin/tests/system/dns64/ns3/named.conf.in
index 4491de1b6e3f5f2d276e70dc3b104ec07ec10610..a86686bdb0e86b59c62b3c4a7341eabd5ad8bb5c 100644 (file)
--- a/bin/tests/system/dns64/ns3/named.conf.in
+++ b/bin/tests/system/dns64/ns3/named.conf.in
@@ -40,6 +40,8 @@ options {
        };
 };
 
+trust-anchors { };
+
 zone "." {
        type hint;
        file "hints";

diff --git a/bin/tests/system/dns64/ns4/named.conf.in b/bin/tests/system/dns64/ns4/named.conf.in
index ca831f92649ca5af019442c9ac4cb3282e22a201..485cdc82f92a908e64e3e354d66983dbbd3b5357 100644 (file)
--- a/bin/tests/system/dns64/ns4/named.conf.in
+++ b/bin/tests/system/dns64/ns4/named.conf.in
@@ -30,6 +30,8 @@ options {
        recursion no;
 };
 
+trust-anchors { };
+
 zone "." {
        type master;
        file "root.db";

diff --git a/bin/tests/system/dnstap/ns1/named.conf.in b/bin/tests/system/dnstap/ns1/named.conf.in
index 7f3fb296d76df04badb4c2a3834b7f7d92324d6b..daaf88731a3b350ef61feab1965a8a266820ab1f 100644 (file)
--- a/bin/tests/system/dnstap/ns1/named.conf.in
+++ b/bin/tests/system/dnstap/ns1/named.conf.in
@@ -32,6 +32,8 @@ options {
        qname-minimization disabled;
 };
 
+trust-anchors { };
+
 key rndc_key {
        secret "1234abcd8765";
        algorithm @DEFAULT_HMAC@;

diff --git a/bin/tests/system/dnstap/ns2/named.conf.in b/bin/tests/system/dnstap/ns2/named.conf.in
index cc05db02ffa700ab378615e89f17d8b61d534b79..12ae86322d6a4d91ea8d33878563f5b38b538382 100644 (file)
--- a/bin/tests/system/dnstap/ns2/named.conf.in
+++ b/bin/tests/system/dnstap/ns2/named.conf.in
@@ -32,6 +32,8 @@ options {
        qname-minimization disabled;
 };
 
+trust-anchors { };
+
 key rndc_key {
        secret "1234abcd8765";
        algorithm @DEFAULT_HMAC@;

diff --git a/bin/tests/system/dnstap/ns3/named.conf.in b/bin/tests/system/dnstap/ns3/named.conf.in
index 1626030ba8c5357a18886ca68ec3d19f1e61ad97..d443c3818ab8f4767eb6a0da91a3d9e8f4e55c03 100644 (file)
--- a/bin/tests/system/dnstap/ns3/named.conf.in
+++ b/bin/tests/system/dnstap/ns3/named.conf.in
@@ -33,6 +33,8 @@ options {
        qname-minimization disabled;
 };
 
+trust-anchors { };
+
 server 10.53.0.1 { tcp-only yes; };
 
 key rndc_key {

diff --git a/bin/tests/system/dnstap/ns4/named.conf.in b/bin/tests/system/dnstap/ns4/named.conf.in
index 4a1debf6abb5ab5ac7439a1265cda8f846dfbc85..18c4da1100bcfceaa92fd6c3c8eb9e8f4567dcda 100644 (file)
--- a/bin/tests/system/dnstap/ns4/named.conf.in
+++ b/bin/tests/system/dnstap/ns4/named.conf.in
@@ -32,6 +32,8 @@ options {
        qname-minimization disabled;
 };
 
+trust-anchors { };
+
 server 10.53.0.1 { tcp-only yes; };
 
 key rndc_key {

diff --git a/bin/tests/system/doth/ns1/named.conf.in b/bin/tests/system/doth/ns1/named.conf.in
index 6a8bcdbda5d86b6e57d2300cef581bb4d9e35914..6a323db68e992f14e64f7bd77276b7db9b973452 100644 (file)
--- a/bin/tests/system/doth/ns1/named.conf.in
+++ b/bin/tests/system/doth/ns1/named.conf.in
@@ -100,6 +100,8 @@ options {
        transfers-out 100;
 };
 
+trust-anchors { };
+
 zone "." {
        type primary;
        file "root.db";

diff --git a/bin/tests/system/doth/ns2/named.conf.in b/bin/tests/system/doth/ns2/named.conf.in
index e533f47e4a2c1fafc00dd92eb0f111be894c8e34..2fa20b193db04073338c925768783146ec00bfe2 100644 (file)
--- a/bin/tests/system/doth/ns2/named.conf.in
+++ b/bin/tests/system/doth/ns2/named.conf.in
@@ -53,6 +53,8 @@ options {
        transfers-out 100;
 };
 
+trust-anchors { };
+
 zone "." {
        type hint;
        file "../../_common/root.hint";

diff --git a/bin/tests/system/doth/ns3/named.conf.in b/bin/tests/system/doth/ns3/named.conf.in
index cd1ab9cfa6e9a02a4d93a21d0ac9d34479116093..69de2ca1468bd12206f6ab32e4502743f8c12085 100644 (file)
--- a/bin/tests/system/doth/ns3/named.conf.in
+++ b/bin/tests/system/doth/ns3/named.conf.in
@@ -46,6 +46,8 @@ options {
        dnssec-validation yes;
 };
 
+trust-anchors { };
+
 zone "." {
        type hint;
        file "../../_common/root.hint";

diff --git a/bin/tests/system/doth/ns4/named.conf.in b/bin/tests/system/doth/ns4/named.conf.in
index c7c6c91a58a847f5b9cbe033f2ad29b7a668fa71..60072ce9c20a2d054ba5d4119b9400efac7fe9fd 100644 (file)
--- a/bin/tests/system/doth/ns4/named.conf.in
+++ b/bin/tests/system/doth/ns4/named.conf.in
@@ -54,6 +54,8 @@ options {
        dnssec-validation yes;
 };
 
+trust-anchors { };
+
 zone "." {
        type hint;
        file "../../_common/root.hint";

diff --git a/bin/tests/system/doth/ns5/named.conf.in b/bin/tests/system/doth/ns5/named.conf.in
index 6808618882de260e3f2c93796afe328a44e14ac6..e161a3e4cffa21763c02034afc2cc26accf561c0 100644 (file)
--- a/bin/tests/system/doth/ns5/named.conf.in
+++ b/bin/tests/system/doth/ns5/named.conf.in
@@ -42,6 +42,8 @@ options {
        dnssec-validation yes;
 };
 
+trust-anchors { };
+
 zone "." {
        type hint;
        file "../../_common/root.hint";

diff --git a/bin/tests/system/fetchlimit/ns3/named1.conf.in b/bin/tests/system/fetchlimit/ns3/named1.conf.in
index e493d8a4d774cbc5c27a656ad0ab44fda6aa93e4..da1661d920f54c3bc1e7545be4a19b13e456c5bf 100644 (file)
--- a/bin/tests/system/fetchlimit/ns3/named1.conf.in
+++ b/bin/tests/system/fetchlimit/ns3/named1.conf.in
@@ -28,6 +28,8 @@ options {
        fetches-per-server 400;
 };
 
+trust-anchors { };
+
 server 10.53.0.4 {
        edns no;
 };

diff --git a/bin/tests/system/fetchlimit/ns3/named2.conf.in b/bin/tests/system/fetchlimit/ns3/named2.conf.in
index 2d0dcef24bcdc183ff0eec1be0d74f33666d4b11..d354dfd39fb9fd4e935c181ba7bd8e97efc51dcc 100644 (file)
--- a/bin/tests/system/fetchlimit/ns3/named2.conf.in
+++ b/bin/tests/system/fetchlimit/ns3/named2.conf.in
@@ -26,6 +26,8 @@ options {
        fetches-per-zone 40;
 };
 
+trust-anchors { };
+
 server 10.53.0.4 {
        edns no;
 };

diff --git a/bin/tests/system/fetchlimit/ns3/named3.conf.in b/bin/tests/system/fetchlimit/ns3/named3.conf.in
index f056fbbf7bfee3e0f219d50fb38851900c292e1a..db32409ed30947d6576cc7c2460bd2af7e76184f 100644 (file)
--- a/bin/tests/system/fetchlimit/ns3/named3.conf.in
+++ b/bin/tests/system/fetchlimit/ns3/named3.conf.in
@@ -26,6 +26,8 @@ options {
        recursive-clients 400;
 };
 
+trust-anchors { };
+
 server 10.53.0.4 {
        edns no;
 };

diff --git a/bin/tests/system/fetchlimit/ns5/named1.conf.in b/bin/tests/system/fetchlimit/ns5/named1.conf.in
index d3c62c225c9111f9a0135788ccad9053fe118c9d..f26b8a19413b05b5798f4b8978ef14ae6886c853 100644 (file)
--- a/bin/tests/system/fetchlimit/ns5/named1.conf.in
+++ b/bin/tests/system/fetchlimit/ns5/named1.conf.in
@@ -27,6 +27,8 @@ options {
        max-clients-per-query 10;
 };
 
+trust-anchors { };
+
 server 10.53.0.4 {
        edns no;
 };

diff --git a/bin/tests/system/fetchlimit/ns5/named2.conf.in b/bin/tests/system/fetchlimit/ns5/named2.conf.in
index cb33d30716867594b148cd22fb2884bf8c62ce61..ba5ef64009d63eed357ef919ca169195624f8d3b 100644 (file)
--- a/bin/tests/system/fetchlimit/ns5/named2.conf.in
+++ b/bin/tests/system/fetchlimit/ns5/named2.conf.in
@@ -30,6 +30,8 @@ options {
        max-clients-per-query 10;
 };
 
+trust-anchors { };
+
 server 10.53.0.4 {
        edns no;
 };

diff --git a/bin/tests/system/filter-aaaa/ns1/named1.conf.in b/bin/tests/system/filter-aaaa/ns1/named1.conf.in
index f5f09055126fcb2fb04d48116fdde0729956765d..c4e6eacc8c36cf00e4999f3ebb9f6c8061c01637 100644 (file)
--- a/bin/tests/system/filter-aaaa/ns1/named1.conf.in
+++ b/bin/tests/system/filter-aaaa/ns1/named1.conf.in
@@ -25,6 +25,8 @@ options {
        minimal-responses no;
 };
 
+trust-anchors { };
+
 acl filterees { 10.53.0.1; };
 
 plugin query "../../../../plugins/.libs/filter-aaaa.so" {

diff --git a/bin/tests/system/filter-aaaa/ns1/named2.conf.in b/bin/tests/system/filter-aaaa/ns1/named2.conf.in
index 3152f96f0ef76b4172ca37ad54622a5fd289969e..d82ed2d50fb83b06192cf23af355c74c22e460db 100644 (file)
--- a/bin/tests/system/filter-aaaa/ns1/named2.conf.in
+++ b/bin/tests/system/filter-aaaa/ns1/named2.conf.in
@@ -25,6 +25,8 @@ options {
        minimal-responses no;
 };
 
+trust-anchors { };
+
 plugin query "../../../../plugins/.libs/filter-aaaa.so" {
        filter-aaaa-on-v6 yes;
        filter-aaaa { fd92:7065:b8e:ffff::1; };

diff --git a/bin/tests/system/forward/ns3/named1.conf.in b/bin/tests/system/forward/ns3/named1.conf.in
index ffc0718bfc09a2b0dfc8062dd61aa98b8557318c..91de8f854035fac9129fccc48e59d52a8ca55091 100644 (file)
--- a/bin/tests/system/forward/ns3/named1.conf.in
+++ b/bin/tests/system/forward/ns3/named1.conf.in
@@ -27,6 +27,8 @@ options {
        dnssec-validation yes;
 };
 
+trust-anchors { };
+
 key rndc_key {
        secret "1234abcd8765";
        algorithm @DEFAULT_HMAC@;

diff --git a/bin/tests/system/forward/ns4/named.conf.in b/bin/tests/system/forward/ns4/named.conf.in
index f6524d5858bbf91f5a51ed0b75f16f42065f9aad..e8d3bbb8a5cf0aae427b30e780a21ce72ac63eaa 100644 (file)
--- a/bin/tests/system/forward/ns4/named.conf.in
+++ b/bin/tests/system/forward/ns4/named.conf.in
@@ -27,6 +27,8 @@ options {
        minimal-responses yes;
 };
 
+trust-anchors { };
+
 zone "." {
        type hint;
        file "root.db";

diff --git a/bin/tests/system/forward/ns5/named.conf.in b/bin/tests/system/forward/ns5/named.conf.in
index 024f49be16f75a49fde66a1603d900b92f22d1f9..15b89dd0e7c3d14765737ff6fd7dc04ae1b6afed 100644 (file)
--- a/bin/tests/system/forward/ns5/named.conf.in
+++ b/bin/tests/system/forward/ns5/named.conf.in
@@ -25,6 +25,8 @@ options {
        dnssec-validation yes;
 };
 
+trust-anchors { };
+
 zone "." {
        type hint;
        file "root.db";

diff --git a/bin/tests/system/forward/ns7/named.conf.in b/bin/tests/system/forward/ns7/named.conf.in
index 302bb55e5d9a05fb4a2c53187994d731224d9a47..c6e55a89bc1dde3ef81aa349436399cd2090a2ec 100644 (file)
--- a/bin/tests/system/forward/ns7/named.conf.in
+++ b/bin/tests/system/forward/ns7/named.conf.in
@@ -24,6 +24,8 @@ options {
        dnssec-validation yes;
 };
 
+trust-anchors { };
+
 zone "." {
        type hint;
        file "root.db";

diff --git a/bin/tests/system/forward/ns8/named.conf.in b/bin/tests/system/forward/ns8/named.conf.in
index 2de656fe2ff2eb35a4a428858eabf4577575d738..13c38594e090a70ba0f80714db1bbec71b95facf 100644 (file)
--- a/bin/tests/system/forward/ns8/named.conf.in
+++ b/bin/tests/system/forward/ns8/named.conf.in
@@ -24,6 +24,8 @@ options {
        dnssec-validation yes;
 };
 
+trust-anchors { };
+
 zone "." {
        type hint;
        file "root.db";

diff --git a/bin/tests/system/hooks/ns1/named.conf.in b/bin/tests/system/hooks/ns1/named.conf.in
index 956bf41ef44f9756e7dee3037732aca338800a3d..30ae85ae84879f7bbe10359db2fc241117652f04 100644 (file)
--- a/bin/tests/system/hooks/ns1/named.conf.in
+++ b/bin/tests/system/hooks/ns1/named.conf.in
@@ -24,6 +24,8 @@ options {
        minimal-responses no;
 };
 
+trust-anchors { };
+
 plugin query "../driver/.libs/test-async.so";
 
 key rndc_key {

diff --git a/bin/tests/system/legacy/ns1/named1.conf.in b/bin/tests/system/legacy/ns1/named1.conf.in
index 5c4b1c400bc8e37a2b9723cb65302ebea9bd86f0..bada7eb63076dd7f868b01143e22a70dc5005147 100644 (file)
--- a/bin/tests/system/legacy/ns1/named1.conf.in
+++ b/bin/tests/system/legacy/ns1/named1.conf.in
@@ -23,6 +23,8 @@ options {
        dnssec-validation yes;
 };
 
+trust-anchors { };
+
 key rndc_key {
        secret "1234abcd8765";
        algorithm @DEFAULT_HMAC@;

diff --git a/bin/tests/system/masterfile/ns2/named.conf.in b/bin/tests/system/masterfile/ns2/named.conf.in
index 2a84f86f26d73c5244b4a28a9f80c07804ab1073..e1e8dc2bf6bf522c72e46569e062169b40b3f437 100644 (file)
--- a/bin/tests/system/masterfile/ns2/named.conf.in
+++ b/bin/tests/system/masterfile/ns2/named.conf.in
@@ -26,6 +26,8 @@ options {
        dnssec-validation yes;
 };
 
+trust-anchors { };
+
 zone "." {
        type hint;
        file "../../_common/root.hint";

diff --git a/bin/tests/system/mkeys/ns1/named1.conf.in b/bin/tests/system/mkeys/ns1/named1.conf.in
index 4271668ea97e4f7b979950b83e3195ca686e315d..d45e98d768c91ca7ac4a7f64c9fb3fee1d6dd1a9 100644 (file)
--- a/bin/tests/system/mkeys/ns1/named1.conf.in
+++ b/bin/tests/system/mkeys/ns1/named1.conf.in
@@ -32,6 +32,8 @@ options {
        allow-query { allowed; };
 };
 
+trust-anchors { };
+
 key rndc_key {
        secret "1234abcd8765";
        algorithm @DEFAULT_HMAC@;

diff --git a/bin/tests/system/mkeys/ns1/named2.conf.in b/bin/tests/system/mkeys/ns1/named2.conf.in
index 4271668ea97e4f7b979950b83e3195ca686e315d..d45e98d768c91ca7ac4a7f64c9fb3fee1d6dd1a9 100644 (file)
--- a/bin/tests/system/mkeys/ns1/named2.conf.in
+++ b/bin/tests/system/mkeys/ns1/named2.conf.in
@@ -32,6 +32,8 @@ options {
        allow-query { allowed; };
 };
 
+trust-anchors { };
+
 key rndc_key {
        secret "1234abcd8765";
        algorithm @DEFAULT_HMAC@;

diff --git a/bin/tests/system/mkeys/ns1/named3.conf.in b/bin/tests/system/mkeys/ns1/named3.conf.in
index 686177edb025cc46db7e30d612b876f3bb9f48ce..12b8c71c54689e1f168d13624d44fd3f9a4b6ce4 100644 (file)
--- a/bin/tests/system/mkeys/ns1/named3.conf.in
+++ b/bin/tests/system/mkeys/ns1/named3.conf.in
@@ -26,6 +26,8 @@ options {
        dnssec-validation yes;
 };
 
+trust-anchors { };
+
 key rndc_key {
        secret "1234abcd8765";
        algorithm @DEFAULT_HMAC@;

diff --git a/bin/tests/system/nsupdate/ns3/named.conf.in b/bin/tests/system/nsupdate/ns3/named.conf.in
index 5473b7eea045875a847638771dbf274d8bedde96..b62885111a5e3b77b69febf0f3894738cd0edf44 100644 (file)
--- a/bin/tests/system/nsupdate/ns3/named.conf.in
+++ b/bin/tests/system/nsupdate/ns3/named.conf.in
@@ -26,6 +26,8 @@ options {
        dnssec-validation yes;
 };
 
+trust-anchors { };
+
 key rndc_key {
        secret "1234abcd8765";
        algorithm @DEFAULT_HMAC@;

diff --git a/bin/tests/system/pipelined/ns2/named.conf.in b/bin/tests/system/pipelined/ns2/named.conf.in
index 98026893f68f32c3b9234adc69ce36e59194fb98..8cb605c8bd93e633e760c9763785b4bacac4f246 100644 (file)
--- a/bin/tests/system/pipelined/ns2/named.conf.in
+++ b/bin/tests/system/pipelined/ns2/named.conf.in
@@ -24,6 +24,8 @@ options {
        notify yes;
 };
 
+trust-anchors { };
+
 key rndc_key {
        secret "1234abcd8765";
        algorithm @DEFAULT_HMAC@;

diff --git a/bin/tests/system/pipelined/ns3/named.conf.in b/bin/tests/system/pipelined/ns3/named.conf.in
index 3fe8f56422ae82d0a2b088de578b3303f8bf7e13..96a9a92b6cb44cf20bc68a026a2d9a965d915c28 100644 (file)
--- a/bin/tests/system/pipelined/ns3/named.conf.in
+++ b/bin/tests/system/pipelined/ns3/named.conf.in
@@ -24,6 +24,8 @@ options {
        notify yes;
 };
 
+trust-anchors { };
+
 key rndc_key {
        secret "1234abcd8765";
        algorithm @DEFAULT_HMAC@;

diff --git a/bin/tests/system/pipelined/ns4/named.conf.in b/bin/tests/system/pipelined/ns4/named.conf.in
index c36ec91db544ad118fac4e6463a0fdb64796076f..3a187bf9350247ae4c333e3888bfbf88327168e8 100644 (file)
--- a/bin/tests/system/pipelined/ns4/named.conf.in
+++ b/bin/tests/system/pipelined/ns4/named.conf.in
@@ -25,6 +25,8 @@ options {
        notify yes;
 };
 
+trust-anchors { };
+
 key rndc_key {
        secret "1234abcd8765";
        algorithm @DEFAULT_HMAC@;

diff --git a/bin/tests/system/proxy/ns1/named.conf.in b/bin/tests/system/proxy/ns1/named.conf.in
index 0be6c355f83d3acfba5a192392fccb7a8bcb6293..4e2c620cd7a8ba6e3de01848487e87a24080df62 100644 (file)
--- a/bin/tests/system/proxy/ns1/named.conf.in
+++ b/bin/tests/system/proxy/ns1/named.conf.in
@@ -54,6 +54,8 @@ options {
        tcp-initial-timeout 1200;
 };
 
+trust-anchors { };
+
 zone "example0" {
        type primary;
        file "example.db";

diff --git a/bin/tests/system/proxy/ns3/named.conf.in b/bin/tests/system/proxy/ns3/named.conf.in
index 5583eb2c9b5004fe4d75c318a5a86abfead57d65..db1c3467e60aa31ec53a8572cf69e736286ca5d4 100644 (file)
--- a/bin/tests/system/proxy/ns3/named.conf.in
+++ b/bin/tests/system/proxy/ns3/named.conf.in
@@ -49,6 +49,8 @@ options {
        tcp-initial-timeout 1200;
 };
 
+trust-anchors { };
+
 zone "example" {
        type primary;
        file "example.db";

diff --git a/bin/tests/system/reclimit/ns3/named1.conf.in b/bin/tests/system/reclimit/ns3/named1.conf.in
index 58b5d025144a6dca80c7a9f2d78899d5664a8692..7771d834a2e5f6937094a6fed07250e3099acd4e 100644 (file)
--- a/bin/tests/system/reclimit/ns3/named1.conf.in
+++ b/bin/tests/system/reclimit/ns3/named1.conf.in
@@ -27,6 +27,8 @@ options {
        dnssec-validation yes;
 };
 
+trust-anchors { };
+
 key rndc_key {
        secret "1234abcd8765";
        algorithm @DEFAULT_HMAC@;

diff --git a/bin/tests/system/reclimit/ns3/named2.conf.in b/bin/tests/system/reclimit/ns3/named2.conf.in
index b5389f4ff9f1337e8369a540b76a3088aad1b018..974b24bcff0437937c5bc88f022dd75ccef1140f 100644 (file)
--- a/bin/tests/system/reclimit/ns3/named2.conf.in
+++ b/bin/tests/system/reclimit/ns3/named2.conf.in
@@ -27,6 +27,8 @@ options {
        dnssec-validation yes;
 };
 
+trust-anchors { };
+
 key rndc_key {
        secret "1234abcd8765";
        algorithm @DEFAULT_HMAC@;

diff --git a/bin/tests/system/reclimit/ns3/named3.conf.in b/bin/tests/system/reclimit/ns3/named3.conf.in
index f356f2487f9bc9448c9102205d8ba8d1373c9570..38a77ae35c8b903c9ed4b33c33b7c8d74e52a7ea 100644 (file)
--- a/bin/tests/system/reclimit/ns3/named3.conf.in
+++ b/bin/tests/system/reclimit/ns3/named3.conf.in
@@ -28,6 +28,8 @@ options {
        dnssec-validation yes;
 };
 
+trust-anchors { };
+
 key rndc_key {
        secret "1234abcd8765";
        algorithm @DEFAULT_HMAC@;

diff --git a/bin/tests/system/reclimit/ns3/named4.conf.in b/bin/tests/system/reclimit/ns3/named4.conf.in
index 728f00bb26cf2f82d949de248647d9b2d138b6ae..5a0660766f6f11b89bb319a6b0228c062146bbc9 100644 (file)
--- a/bin/tests/system/reclimit/ns3/named4.conf.in
+++ b/bin/tests/system/reclimit/ns3/named4.conf.in
@@ -28,6 +28,8 @@ options {
        dnssec-validation yes;
 };
 
+trust-anchors { };
+
 key rndc_key {
        secret "1234abcd8765";
        algorithm @DEFAULT_HMAC@;

diff --git a/bin/tests/system/redirect/ns1/named.conf.in b/bin/tests/system/redirect/ns1/named.conf.in
index 412b874240afa1226abfafb4c61477573c37ea48..3b4ccad02873114e9de3cdc3d5b5806e793b8e1f 100644 (file)
--- a/bin/tests/system/redirect/ns1/named.conf.in
+++ b/bin/tests/system/redirect/ns1/named.conf.in
@@ -28,6 +28,8 @@ options {
        dnssec-validation yes;
 };
 
+trust-anchors { };
+
 zone "." {
        type primary;
        file "root.db";
@@ -53,5 +55,3 @@ zone "." {
        file "redirect.db";
        allow-query { !10.53.0.2; !10.53.0.4; any; };
 };
-
-// include "trusted.conf";

diff --git a/bin/tests/system/redirect/ns2/named.conf.in b/bin/tests/system/redirect/ns2/named.conf.in
index 881a81f9d10a2c67e3f1fa53916e0ed9e87dc00c..e07d75bdfe3a66ddef6fc1f67ccf29ca89333705 100644 (file)
--- a/bin/tests/system/redirect/ns2/named.conf.in
+++ b/bin/tests/system/redirect/ns2/named.conf.in
@@ -31,6 +31,8 @@ options {
 
 };
 
+trust-anchors { };
+
 key rndc_key {
        secret "1234abcd8765";
        algorithm @DEFAULT_HMAC@;

diff --git a/bin/tests/system/redirect/ns3/named.conf.in b/bin/tests/system/redirect/ns3/named.conf.in
index 2113dd59235ad5033ce0684978926b1db6a70d34..51e590f630cfe41c6788609e4b0b01fa27a46c3b 100644 (file)
--- a/bin/tests/system/redirect/ns3/named.conf.in
+++ b/bin/tests/system/redirect/ns3/named.conf.in
@@ -26,6 +26,8 @@ options {
        dnssec-validation yes;
 };
 
+trust-anchors { };
+
 zone "." {
        type primary;
        file "root.db";
@@ -50,5 +52,3 @@ zone "redirect" {
        type primary;
        file "redirect.db";
 };
-
-// include "trusted.conf";

diff --git a/bin/tests/system/redirect/ns4/named.conf.in b/bin/tests/system/redirect/ns4/named.conf.in
index 1650e99a7bf6d43693d6707e716141cd4d4d7ce5..8937453ace8060de5bbe462e0ddede08eba62a2a 100644 (file)
--- a/bin/tests/system/redirect/ns4/named.conf.in
+++ b/bin/tests/system/redirect/ns4/named.conf.in
@@ -31,6 +31,8 @@ options {
        nxdomain-redirect "redirect";
 };
 
+trust-anchors { };
+
 key rndc_key {
        secret "1234abcd8765";
        algorithm @DEFAULT_HMAC@;

diff --git a/bin/tests/system/resolver/ns1/named.conf.in b/bin/tests/system/resolver/ns1/named.conf.in
index f0f9571209893eb2ef78063455b24b88843434a1..fbcb6c1dd3a278f9696c2f8f3915140192918846 100644 (file)
--- a/bin/tests/system/resolver/ns1/named.conf.in
+++ b/bin/tests/system/resolver/ns1/named.conf.in
@@ -31,6 +31,8 @@ options {
        attach-cache "globalcache";
 };
 
+trust-anchors { };
+
 server 10.53.0.3 {
        tcp-only yes;
 };

diff --git a/bin/tests/system/resolver/ns5/named.conf.in b/bin/tests/system/resolver/ns5/named.conf.in
index 9856d8e5b1a2e28e925283c6b6c4a5cbbf518321..dc1704fd28e4bc30b9d168a68ad66242684b5c39 100644 (file)
--- a/bin/tests/system/resolver/ns5/named.conf.in
+++ b/bin/tests/system/resolver/ns5/named.conf.in
@@ -27,6 +27,8 @@ options {
        prefetch 4 10;
 };
 
+include "trusted.conf";
+
 server 10.53.0.7 {
        edns-version 0;
 };

diff --git a/bin/tests/system/resolver/ns7/named1.conf.in b/bin/tests/system/resolver/ns7/named1.conf.in
index 1d32ae9745269dd1b79543f53399b82d6f8d961f..170ce62716dc1d2a46658f7f14afd33c1047993c 100644 (file)
--- a/bin/tests/system/resolver/ns7/named1.conf.in
+++ b/bin/tests/system/resolver/ns7/named1.conf.in
@@ -34,6 +34,8 @@ options {
        edns-udp-size 4096;
 };
 
+trust-anchors { };
+
 key rndc_key {
        secret "1234abcd8765";
        algorithm @DEFAULT_HMAC@;

diff --git a/bin/tests/system/resolver/ns7/named2.conf.in b/bin/tests/system/resolver/ns7/named2.conf.in
index 1d32ae9745269dd1b79543f53399b82d6f8d961f..170ce62716dc1d2a46658f7f14afd33c1047993c 100644 (file)
--- a/bin/tests/system/resolver/ns7/named2.conf.in
+++ b/bin/tests/system/resolver/ns7/named2.conf.in
@@ -34,6 +34,8 @@ options {
        edns-udp-size 4096;
 };
 
+trust-anchors { };
+
 key rndc_key {
        secret "1234abcd8765";
        algorithm @DEFAULT_HMAC@;

diff --git a/bin/tests/system/resolver/ns9/named.conf.in b/bin/tests/system/resolver/ns9/named.conf.in
index 3be31db6f82a6ab5cb95dd2f3bfbd18c0c729555..140cd26b58dbf1d9ee17357e52446addecb07042 100644 (file)
--- a/bin/tests/system/resolver/ns9/named.conf.in
+++ b/bin/tests/system/resolver/ns9/named.conf.in
@@ -24,6 +24,8 @@ options {
        qname-minimization off;
 };
 
+trust-anchors { };
+
 key rndc_key {
        secret "1234abcd8765";
        algorithm @DEFAULT_HMAC@;

diff --git a/bin/tests/system/rndc/ns4/named.conf.in b/bin/tests/system/rndc/ns4/named.conf.in
index 6dc37ec3b299e4db59777f37d4dd2ef0d312c7f4..0ec0cc7bf8847cf3a8bf9a6d5bcdb9bf910a6087 100644 (file)
--- a/bin/tests/system/rndc/ns4/named.conf.in
+++ b/bin/tests/system/rndc/ns4/named.conf.in
@@ -20,6 +20,8 @@ options {
        dnssec-validation yes;
 };
 
+trust-anchors { };
+
 view normal {
        match-clients { any; };
 

diff --git a/bin/tests/system/rpz/ns3/named.conf.in b/bin/tests/system/rpz/ns3/named.conf.in
index 80a9d832f03d3bfdbfbf09ee1bb1b255fafe6606..b2ba42720c0b174b4273cf392bdae99eb826e711 100644 (file)
--- a/bin/tests/system/rpz/ns3/named.conf.in
+++ b/bin/tests/system/rpz/ns3/named.conf.in
@@ -64,6 +64,8 @@ options {
        notify-delay 0;
 };
 
+trust-anchors { };
+
 logging { category rpz { default_debug; }; };
 
 key rndc_key {

diff --git a/bin/tests/system/rpz/ns8/named.conf.in b/bin/tests/system/rpz/ns8/named.conf.in
index aa8b342d99d92707d86ce2916e592bfdd32fdcbb..87f6c8e3526207e2f03ca7036671499d18feb78e 100644 (file)
--- a/bin/tests/system/rpz/ns8/named.conf.in
+++ b/bin/tests/system/rpz/ns8/named.conf.in
@@ -46,6 +46,8 @@ options {
        notify-delay 0;
 };
 
+trust-anchors { };
+
 logging { category rpz { default_debug; }; };
 
 key rndc_key {

diff --git a/bin/tests/system/rpz/ns9/named.conf.in b/bin/tests/system/rpz/ns9/named.conf.in
index 0d3fce78524da37371827f3334e9bd77916f583b..6010082c8fc76fc5574ca8bde7396c725d6d4b52 100644 (file)
--- a/bin/tests/system/rpz/ns9/named.conf.in
+++ b/bin/tests/system/rpz/ns9/named.conf.in
@@ -40,6 +40,8 @@ options {
        notify-delay 0;
 };
 
+trust-anchors { };
+
 logging { category rpz { default_debug; }; };
 
 key rndc_key {

diff --git a/bin/tests/system/rpzrecurse/ns2/named.conf.header.in b/bin/tests/system/rpzrecurse/ns2/named.conf.header.in
index 90a17b7a37b8b9851ea20b0e208db859c4dc0dc5..3973eba5ee573ba5bd33271ba0ff99c9981450e4 100644 (file)
--- a/bin/tests/system/rpzrecurse/ns2/named.conf.header.in
+++ b/bin/tests/system/rpzrecurse/ns2/named.conf.header.in
@@ -30,6 +30,8 @@ options {
        include "../dnsrps.conf";
 };
 
+trust-anchors { };
+
 key rndc_key {
        secret "1234abcd8765";
        algorithm @DEFAULT_HMAC@;

diff --git a/bin/tests/system/rpzrecurse/ns3/named1.conf.in b/bin/tests/system/rpzrecurse/ns3/named1.conf.in
index 6a1bd1165800c8d9de4916d3c6e82fa77d871b6a..3159c63e7b95afd0fc87b4601d4195d2e642fd35 100644 (file)
--- a/bin/tests/system/rpzrecurse/ns3/named1.conf.in
+++ b/bin/tests/system/rpzrecurse/ns3/named1.conf.in
@@ -36,6 +36,8 @@ options {
        include "../dnsrps.conf";
 };
 
+trust-anchors { };
+
 zone "policy" { type primary; file "policy.db"; };
 
 zone "example.tld" { type primary; file "example.db"; };

diff --git a/bin/tests/system/rpzrecurse/ns3/named2.conf.in b/bin/tests/system/rpzrecurse/ns3/named2.conf.in
index 06b2536e807e53fe6f07b96bd807d9b80be99b87..2370b4371abb451bb7d303d0a38cf5708f597ea1 100644 (file)
--- a/bin/tests/system/rpzrecurse/ns3/named2.conf.in
+++ b/bin/tests/system/rpzrecurse/ns3/named2.conf.in
@@ -35,6 +35,8 @@ options {
        include "../dnsrps.conf";
 };
 
+trust-anchors { };
+
 zone "policy" { type primary; file "policy.db"; };
 
 zone "example.tld" { type primary; file "example.db"; };

diff --git a/bin/tests/system/rpzrecurse/ns3/named3.conf.in b/bin/tests/system/rpzrecurse/ns3/named3.conf.in
index ac2e19cac059139b67de16592560b4595b260a67..af57689b9a2218ce100cf879551080f0446a85aa 100644 (file)
--- a/bin/tests/system/rpzrecurse/ns3/named3.conf.in
+++ b/bin/tests/system/rpzrecurse/ns3/named3.conf.in
@@ -33,6 +33,8 @@ options {
        include "../dnsrps.conf";
 };
 
+trust-anchors { };
+
 zone "policy" { type primary; file "policy.db"; };
 
 zone "example.tld" { type primary; file "example.db"; };

diff --git a/bin/tests/system/rrl/ns1/named.conf.in b/bin/tests/system/rrl/ns1/named.conf.in
index e4da6efcc954739b13d04c323fb69cbbffe97d9e..a71e1ee215160cc350e146052214fa181d62a404 100644 (file)
--- a/bin/tests/system/rrl/ns1/named.conf.in
+++ b/bin/tests/system/rrl/ns1/named.conf.in
@@ -25,4 +25,6 @@ options {
        dnssec-validation yes;
 };
 
+trust-anchors { };
+
 zone "." {type primary; file "root.db";};

diff --git a/bin/tests/system/rrl/ns2/named.conf.in b/bin/tests/system/rrl/ns2/named.conf.in
index abe4f9cea39560010a1f7920d62e87a578d3120c..298d37050aa2bd8f9e93a72e86cb9dd0330499a4 100644 (file)
--- a/bin/tests/system/rrl/ns2/named.conf.in
+++ b/bin/tests/system/rrl/ns2/named.conf.in
@@ -36,6 +36,8 @@ options {
        };
 };
 
+trust-anchors { };
+
 key rndc_key {
        secret "1234abcd8765";
        algorithm @DEFAULT_HMAC@;

diff --git a/bin/tests/system/rrl/ns3/named.conf.in b/bin/tests/system/rrl/ns3/named.conf.in
index 8807f44b6ea46739b89ecd8070c6ac8a4455fa28..4bc0d6fc4a5f68776ff1b4ec5e35393b42d5e6cb 100644 (file)
--- a/bin/tests/system/rrl/ns3/named.conf.in
+++ b/bin/tests/system/rrl/ns3/named.conf.in
@@ -43,6 +43,8 @@ options {
 
 };
 
+trust-anchors { };
+
 zone "." { type hint; file "hints"; };
 
 zone "tld3."{ type primary; file "tld3.db"; };

diff --git a/bin/tests/system/rrl/ns4/named.conf.in b/bin/tests/system/rrl/ns4/named.conf.in
index 3cd598e63b1bfc59642d536c0fbac62085b4faff..bb169f047d34b641eb4c4feb1a7caefe098a6f9a 100644 (file)
--- a/bin/tests/system/rrl/ns4/named.conf.in
+++ b/bin/tests/system/rrl/ns4/named.conf.in
@@ -38,6 +38,8 @@ options {
        };
 };
 
+trust-anchors { };
+
 key rndc_key {
        secret "1234abcd8765";
        algorithm @DEFAULT_HMAC@;

diff --git a/bin/tests/system/rrsetorder/ns3/named.conf.in b/bin/tests/system/rrsetorder/ns3/named.conf.in
index 807fa37820d39251582efab2de554fe71c4ae4ef..cdab83ed24baade951eff8ab95c1ab2a8d47299e 100644 (file)
--- a/bin/tests/system/rrsetorder/ns3/named.conf.in
+++ b/bin/tests/system/rrsetorder/ns3/named.conf.in
@@ -32,6 +32,8 @@ options {
        };
 };
 
+trust-anchors { };
+
 zone "." {
        type hint;
        file "../../_common/root.hint";

diff --git a/bin/tests/system/rrsetorder/ns4/named.conf.in b/bin/tests/system/rrsetorder/ns4/named.conf.in
index d5fc5274aee684343909fb702f2df2454b2e33f7..5187aa8fb1cf79f9c035920f436ef47abc1baa04 100644 (file)
--- a/bin/tests/system/rrsetorder/ns4/named.conf.in
+++ b/bin/tests/system/rrsetorder/ns4/named.conf.in
@@ -28,6 +28,8 @@ options {
 
 };
 
+trust-anchors { };
+
 zone "." {
        type hint;
        file "../../_common/root.hint";

diff --git a/bin/tests/system/rrsetorder/ns5/named.conf.in b/bin/tests/system/rrsetorder/ns5/named.conf.in
index c0836d320a4fd83814bce6b613ba0496a0a25b9b..f7a2486ad607f8d1e66a789d136f22c81c69fd16 100644 (file)
--- a/bin/tests/system/rrsetorder/ns5/named.conf.in
+++ b/bin/tests/system/rrsetorder/ns5/named.conf.in
@@ -24,6 +24,8 @@ options {
        notify yes;
 };
 
+trust-anchors { };
+
 zone "." {
        type hint;
        file "../../_common/root.hint";

diff --git a/bin/tests/system/statistics/ns2/named.conf.in b/bin/tests/system/statistics/ns2/named.conf.in
index 30c46518f85084c5b548ba32b0b2d2d53c47a315..877e26a16f81838b82632733d2aa340b13ff95f5 100644 (file)
--- a/bin/tests/system/statistics/ns2/named.conf.in
+++ b/bin/tests/system/statistics/ns2/named.conf.in
@@ -24,6 +24,8 @@ options {
        notify yes;
 };
 
+trust-anchors { };
+
 statistics-channels {
        inet 10.53.0.2 port @EXTRAPORT1@ allow { any; };
 };

diff --git a/bin/tests/system/statistics/ns3/named.conf.in b/bin/tests/system/statistics/ns3/named.conf.in
index 4cc712d46b9573c0533336d1198222d7fa092438..1726d1d381eb52ee82d9bd714fcab5e02ec509de 100644 (file)
--- a/bin/tests/system/statistics/ns3/named.conf.in
+++ b/bin/tests/system/statistics/ns3/named.conf.in
@@ -27,6 +27,8 @@ options {
        zone-statistics yes;
 };
 
+trust-anchors { };
+
 statistics-channels {
        inet 10.53.0.3 port @EXTRAPORT1@ allow { any; };
 };

diff --git a/bin/tests/system/stress/ns3/named.conf.in b/bin/tests/system/stress/ns3/named.conf.in
index 13e54a54e46ff9d9bd504d93a5064ac7e4f7e907..c11aec2d4889f0089fa20274f9686bda9eae7738 100644 (file)
--- a/bin/tests/system/stress/ns3/named.conf.in
+++ b/bin/tests/system/stress/ns3/named.conf.in
@@ -26,6 +26,8 @@ options {
        notify yes;
 };
 
+trust-anchors { };
+
 key rndc_key {
        secret "1234abcd8765";
        algorithm @DEFAULT_HMAC@;

diff --git a/bin/tests/system/stress/ns4/named.conf.in b/bin/tests/system/stress/ns4/named.conf.in
index 26296f52bf0a558f42d612c22267a57bdb7aef27..2dd2e50675a5f4ddd12020663a1c78022b353311 100644 (file)
--- a/bin/tests/system/stress/ns4/named.conf.in
+++ b/bin/tests/system/stress/ns4/named.conf.in
@@ -26,6 +26,8 @@ options {
        notify yes;
 };
 
+trust-anchors { };
+
 zone "zone000000.example" {
        type secondary;
        file "zone000000.example.bk";

diff --git a/bin/tests/system/transport-acl/ns1/named.conf.in b/bin/tests/system/transport-acl/ns1/named.conf.in
index d2a941a7f2d988e2f8b42da23fbb99d258dabe28..a1b970fe2aa849cb19d6450fbc4f95c91ce6583a 100644 (file)
--- a/bin/tests/system/transport-acl/ns1/named.conf.in
+++ b/bin/tests/system/transport-acl/ns1/named.conf.in
@@ -68,6 +68,8 @@ options {
        tcp-initial-timeout 1200;
 };
 
+trust-anchors { };
+
 zone "example0" {
        type primary;
        file "example.db";

diff --git a/bin/tests/system/transport-change/ns1/named-http-plain-proxy.conf.in b/bin/tests/system/transport-change/ns1/named-http-plain-proxy.conf.in
index 012b167ae3f633eb917cbc489d55d8292ad0d738..374cd06a1719f67e525904ed1b76cb592f5eda56 100644 (file)
--- a/bin/tests/system/transport-change/ns1/named-http-plain-proxy.conf.in
+++ b/bin/tests/system/transport-change/ns1/named-http-plain-proxy.conf.in
@@ -40,6 +40,8 @@ options {
        allow-proxy-on { 10.53.0.1; fd92:7065:b8e:ffff::1; };
 };
 
+trust-anchors { };
+
 zone "example" {
        type primary;
        file "example.db";

diff --git a/bin/tests/system/transport-change/ns1/named-http-plain.conf.in b/bin/tests/system/transport-change/ns1/named-http-plain.conf.in
index 627742920bc4d9b64adc654c6ae17b27a0f6658a..5d4b88035a388cd55f0b49111023ee641f431abd 100644 (file)
--- a/bin/tests/system/transport-change/ns1/named-http-plain.conf.in
+++ b/bin/tests/system/transport-change/ns1/named-http-plain.conf.in
@@ -40,6 +40,8 @@ options {
        allow-proxy-on { 10.53.0.1; fd92:7065:b8e:ffff::1; };
 };
 
+trust-anchors { };
+
 zone "example" {
        type primary;
        file "example.db";

diff --git a/bin/tests/system/transport-change/ns1/named-https-proxy-encrypted.conf.in b/bin/tests/system/transport-change/ns1/named-https-proxy-encrypted.conf.in
index 8c28c26a8eb3e159b63e7b5b107f1c6d19ff13cd..45108da9a01e96f047205a9deaf95aa110301aad 100644 (file)
--- a/bin/tests/system/transport-change/ns1/named-https-proxy-encrypted.conf.in
+++ b/bin/tests/system/transport-change/ns1/named-https-proxy-encrypted.conf.in
@@ -40,6 +40,8 @@ options {
        allow-proxy-on { 10.53.0.1; fd92:7065:b8e:ffff::1; };
 };
 
+trust-anchors { };
+
 zone "example" {
        type primary;
        file "example.db";

diff --git a/bin/tests/system/transport-change/ns1/named-https-proxy-plain.conf.in b/bin/tests/system/transport-change/ns1/named-https-proxy-plain.conf.in
index 7b5538ce0d5a459c6abdb37d063ac72abe509951..9001c43f45f91b03b9229b0584e2ae14c3718ca2 100644 (file)
--- a/bin/tests/system/transport-change/ns1/named-https-proxy-plain.conf.in
+++ b/bin/tests/system/transport-change/ns1/named-https-proxy-plain.conf.in
@@ -40,6 +40,8 @@ options {
        allow-proxy-on { 10.53.0.1; fd92:7065:b8e:ffff::1; };
 };
 
+trust-anchors { };
+
 zone "example" {
        type primary;
        file "example.db";

diff --git a/bin/tests/system/transport-change/ns1/named-https.conf.in b/bin/tests/system/transport-change/ns1/named-https.conf.in
index c24346e941dc0e84e923f243c376a26b7118756a..bce99f35ec792f1ebc0ceb79b1968da46115e9af 100644 (file)
--- a/bin/tests/system/transport-change/ns1/named-https.conf.in
+++ b/bin/tests/system/transport-change/ns1/named-https.conf.in
@@ -40,6 +40,8 @@ options {
        allow-proxy-on { 10.53.0.1; fd92:7065:b8e:ffff::1; };
 };
 
+trust-anchors { };
+
 zone "example" {
        type primary;
        file "example.db";

diff --git a/bin/tests/system/transport-change/ns1/named-proxy.conf.in b/bin/tests/system/transport-change/ns1/named-proxy.conf.in
index 1b9fb684aa701dcbb248dde02abf9336c14a4aca..ff549268d52ca995d6352ebc4976884fb1682902 100644 (file)
--- a/bin/tests/system/transport-change/ns1/named-proxy.conf.in
+++ b/bin/tests/system/transport-change/ns1/named-proxy.conf.in
@@ -40,6 +40,8 @@ options {
        allow-proxy-on { 10.53.0.1; fd92:7065:b8e:ffff::1; };
 };
 
+trust-anchors { };
+
 zone "example" {
        type primary;
        file "example.db";

diff --git a/bin/tests/system/transport-change/ns1/named-tls-proxy-encrypted.conf.in b/bin/tests/system/transport-change/ns1/named-tls-proxy-encrypted.conf.in
index 4183fb8a318f954bac6f14f3c83bd9b3a39bdbb6..98c2bf48b9dc0c3f076e0ec02be73b95bfc38b5c 100644 (file)
--- a/bin/tests/system/transport-change/ns1/named-tls-proxy-encrypted.conf.in
+++ b/bin/tests/system/transport-change/ns1/named-tls-proxy-encrypted.conf.in
@@ -40,6 +40,8 @@ options {
        allow-proxy-on { 10.53.0.1; fd92:7065:b8e:ffff::1; };
 };
 
+trust-anchors { };
+
 zone "example" {
        type primary;
        file "example.db";

diff --git a/bin/tests/system/transport-change/ns1/named-tls-proxy-plain.conf.in b/bin/tests/system/transport-change/ns1/named-tls-proxy-plain.conf.in
index 8a283cb21b287367df373b7008a8d2ac95733ab0..20c829f01886ff24ce5b2e128d8af0d6478bae07 100644 (file)
--- a/bin/tests/system/transport-change/ns1/named-tls-proxy-plain.conf.in
+++ b/bin/tests/system/transport-change/ns1/named-tls-proxy-plain.conf.in
@@ -40,6 +40,8 @@ options {
        allow-proxy-on { 10.53.0.1; fd92:7065:b8e:ffff::1; };
 };
 
+trust-anchors { };
+
 zone "example" {
        type primary;
        file "example.db";

diff --git a/bin/tests/system/transport-change/ns1/named-tls.conf.in b/bin/tests/system/transport-change/ns1/named-tls.conf.in
index 4bcc97617366961dea3cc00a95231a611dcd54b1..a436768d6e907e9064f1b9cfc38a142bcfe31c4a 100644 (file)
--- a/bin/tests/system/transport-change/ns1/named-tls.conf.in
+++ b/bin/tests/system/transport-change/ns1/named-tls.conf.in
@@ -40,6 +40,8 @@ options {
        allow-proxy-on { 10.53.0.1; fd92:7065:b8e:ffff::1; };
 };
 
+trust-anchors { };
+
 zone "example" {
        type primary;
        file "example.db";

diff --git a/bin/tests/system/transport-change/ns1/named.conf.in b/bin/tests/system/transport-change/ns1/named.conf.in
index 0ee7fc5d36c09b45b45354dac684c56b9506ec96..e594c6ef06fa6712af7c2eda0572c8de7f9a41f9 100644 (file)
--- a/bin/tests/system/transport-change/ns1/named.conf.in
+++ b/bin/tests/system/transport-change/ns1/named.conf.in
@@ -40,6 +40,8 @@ options {
        allow-proxy-on { 10.53.0.1; fd92:7065:b8e:ffff::1; };
 };
 
+trust-anchors { };
+
 zone "example" {
        type primary;
        file "example.db";

diff --git a/bin/tests/system/zero/ns3/named.conf.in b/bin/tests/system/zero/ns3/named.conf.in
index 7e0d1d7d16d3765f9fbf8aa581f419a166fe8b0e..025dcb46cb5ed263e731dda000968a77cea3a7aa 100644 (file)
--- a/bin/tests/system/zero/ns3/named.conf.in
+++ b/bin/tests/system/zero/ns3/named.conf.in
@@ -24,6 +24,8 @@ options {
        servfail-ttl 0;
 };
 
+trust-anchors { };
+
 zone "." {
        type hint;
        file "root.hint";

diff --git a/bin/tests/system/zero/ns4/named.conf.in b/bin/tests/system/zero/ns4/named.conf.in
index fc8fec6a5ab9b1dfcfd0e2db14c2de32dd6da6ec..037a5e9e47404930abea78a8be508aa944dcb983 100644 (file)
--- a/bin/tests/system/zero/ns4/named.conf.in
+++ b/bin/tests/system/zero/ns4/named.conf.in
@@ -23,6 +23,8 @@ options {
        dnssec-validation yes;
 };
 
+trust-anchors { };
+
 zone "example" {
        type secondary;
        primaries { 10.53.0.2; };

diff --git a/bin/tests/system/zonechecks/ns1/named.conf.in b/bin/tests/system/zonechecks/ns1/named.conf.in
index 68215001476307834486c133b4972e5353e2d802..f563b46d26a0266bc82bf671a379499ed4339a15 100644 (file)
--- a/bin/tests/system/zonechecks/ns1/named.conf.in
+++ b/bin/tests/system/zonechecks/ns1/named.conf.in
@@ -26,6 +26,8 @@ options {
        dnssec-validation yes;
 };
 
+trust-anchors { };
+
 key rndc_key {
        secret "1234abcd8765";
        algorithm @DEFAULT_HMAC@;

diff --git a/bin/tests/system/zonechecks/ns2/named.conf.in b/bin/tests/system/zonechecks/ns2/named.conf.in
index 5ecf68b56f7a72a3f9c78266b5adf982bd8a28bf..8385b5adc81f0fd6b5cc49e5327739645a640b78 100644 (file)
--- a/bin/tests/system/zonechecks/ns2/named.conf.in
+++ b/bin/tests/system/zonechecks/ns2/named.conf.in
@@ -26,6 +26,8 @@ options {
        dnssec-validation yes;
 };
 
+trust-anchors { };
+
 key rndc_key {
        secret "1234abcd8765";
        algorithm @DEFAULT_HMAC@;