From: Nicki Křížek Date: Wed, 8 Jul 2026 18:34:01 +0000 (+0000) Subject: Replace empty controls statements with the controls template X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0170b29c9fbec48430b18298ac2b5334274b68d;p=thirdparty%2Fbind9.git Replace empty controls statements with the controls template None of those tests relies on the controls channel being absent, so make the control channel available same as for all other named test instances. Assisted-by: Claude:claude-fable-5 --- diff --git a/bin/tests/system/additional/ns3/named.conf.j2 b/bin/tests/system/additional/ns3/named.conf.j2 index 0c5f65ae4fd..a72765fa7a1 100644 --- a/bin/tests/system/additional/ns3/named.conf.j2 +++ b/bin/tests/system/additional/ns3/named.conf.j2 @@ -1,4 +1,4 @@ -controls { /* empty */ }; +{% include "_common/controls.conf.j2" %} options { query-source address 10.53.0.3; diff --git a/bin/tests/system/dsdigest/ns1/named.conf.j2 b/bin/tests/system/dsdigest/ns1/named.conf.j2 index 7f7e946e340..8cf3b7ff3af 100644 --- a/bin/tests/system/dsdigest/ns1/named.conf.j2 +++ b/bin/tests/system/dsdigest/ns1/named.conf.j2 @@ -1,6 +1,6 @@ // NS1 -controls { /* empty */ }; +{% include "_common/controls.conf.j2" %} options { query-source address 10.53.0.1; diff --git a/bin/tests/system/dsdigest/ns2/named.conf.j2 b/bin/tests/system/dsdigest/ns2/named.conf.j2 index 1ebb38810a6..7567b78dbb6 100644 --- a/bin/tests/system/dsdigest/ns2/named.conf.j2 +++ b/bin/tests/system/dsdigest/ns2/named.conf.j2 @@ -1,6 +1,6 @@ // NS2 -controls { /* empty */ }; +{% include "_common/controls.conf.j2" %} options { query-source address 10.53.0.2; diff --git a/bin/tests/system/dsdigest/ns3/named.conf.j2 b/bin/tests/system/dsdigest/ns3/named.conf.j2 index 3a6fa3c6406..6164730bd30 100644 --- a/bin/tests/system/dsdigest/ns3/named.conf.j2 +++ b/bin/tests/system/dsdigest/ns3/named.conf.j2 @@ -1,6 +1,6 @@ // NS3 -controls { /* empty */ }; +{% include "_common/controls.conf.j2" %} options { query-source address 10.53.0.3; diff --git a/bin/tests/system/dsdigest/ns4/named.conf.j2 b/bin/tests/system/dsdigest/ns4/named.conf.j2 index dba8ca265ef..a20573f91cc 100644 --- a/bin/tests/system/dsdigest/ns4/named.conf.j2 +++ b/bin/tests/system/dsdigest/ns4/named.conf.j2 @@ -1,6 +1,6 @@ // NS3 -controls { /* empty */ }; +{% include "_common/controls.conf.j2" %} options { query-source address 10.53.0.4; diff --git a/bin/tests/system/ecdsa/ns1/named.conf.j2 b/bin/tests/system/ecdsa/ns1/named.conf.j2 index 7f7e946e340..8cf3b7ff3af 100644 --- a/bin/tests/system/ecdsa/ns1/named.conf.j2 +++ b/bin/tests/system/ecdsa/ns1/named.conf.j2 @@ -1,6 +1,6 @@ // NS1 -controls { /* empty */ }; +{% include "_common/controls.conf.j2" %} options { query-source address 10.53.0.1; diff --git a/bin/tests/system/ecdsa/ns2/named.conf.j2 b/bin/tests/system/ecdsa/ns2/named.conf.j2 index 775ed0175fd..eb2404657d7 100644 --- a/bin/tests/system/ecdsa/ns2/named.conf.j2 +++ b/bin/tests/system/ecdsa/ns2/named.conf.j2 @@ -1,6 +1,6 @@ // NS2 -controls { /* empty */ }; +{% include "_common/controls.conf.j2" %} options { query-source address 10.53.0.2; diff --git a/bin/tests/system/ecdsa/ns3/named.conf.j2 b/bin/tests/system/ecdsa/ns3/named.conf.j2 index 66ea18356d2..381484dfb70 100644 --- a/bin/tests/system/ecdsa/ns3/named.conf.j2 +++ b/bin/tests/system/ecdsa/ns3/named.conf.j2 @@ -1,6 +1,6 @@ // NS2 -controls { /* empty */ }; +{% include "_common/controls.conf.j2" %} options { query-source address 10.53.0.3; diff --git a/bin/tests/system/eddsa/ns1/named.conf.j2 b/bin/tests/system/eddsa/ns1/named.conf.j2 index 7f7e946e340..8cf3b7ff3af 100644 --- a/bin/tests/system/eddsa/ns1/named.conf.j2 +++ b/bin/tests/system/eddsa/ns1/named.conf.j2 @@ -1,6 +1,6 @@ // NS1 -controls { /* empty */ }; +{% include "_common/controls.conf.j2" %} options { query-source address 10.53.0.1; diff --git a/bin/tests/system/eddsa/ns2/named.conf.j2 b/bin/tests/system/eddsa/ns2/named.conf.j2 index 775ed0175fd..eb2404657d7 100644 --- a/bin/tests/system/eddsa/ns2/named.conf.j2 +++ b/bin/tests/system/eddsa/ns2/named.conf.j2 @@ -1,6 +1,6 @@ // NS2 -controls { /* empty */ }; +{% include "_common/controls.conf.j2" %} options { query-source address 10.53.0.2; diff --git a/bin/tests/system/eddsa/ns3/named.conf.j2 b/bin/tests/system/eddsa/ns3/named.conf.j2 index 66ea18356d2..381484dfb70 100644 --- a/bin/tests/system/eddsa/ns3/named.conf.j2 +++ b/bin/tests/system/eddsa/ns3/named.conf.j2 @@ -1,6 +1,6 @@ // NS2 -controls { /* empty */ }; +{% include "_common/controls.conf.j2" %} options { query-source address 10.53.0.3; diff --git a/bin/tests/system/enginepkcs11/ns2/named.conf.j2 b/bin/tests/system/enginepkcs11/ns2/named.conf.j2 index 017545453ca..8e46b4b7924 100644 --- a/bin/tests/system/enginepkcs11/ns2/named.conf.j2 +++ b/bin/tests/system/enginepkcs11/ns2/named.conf.j2 @@ -1,4 +1,4 @@ -controls { /* empty */ }; +{% include "_common/controls.conf.j2" %} options { query-source address 10.53.0.2; diff --git a/bin/tests/system/inline/ns1/named.conf.j2 b/bin/tests/system/inline/ns1/named.conf.j2 index ad39b8d9c07..06cb694e9e3 100644 --- a/bin/tests/system/inline/ns1/named.conf.j2 +++ b/bin/tests/system/inline/ns1/named.conf.j2 @@ -1,6 +1,6 @@ // NS1 -controls { /* empty */ }; +{% include "_common/controls.conf.j2" %} options { query-source address 10.53.0.1; diff --git a/bin/tests/system/stress/ns2/named.conf.j2 b/bin/tests/system/stress/ns2/named.conf.j2 index 6e65ca8be5d..cd47702373d 100644 --- a/bin/tests/system/stress/ns2/named.conf.j2 +++ b/bin/tests/system/stress/ns2/named.conf.j2 @@ -1,4 +1,4 @@ -controls { /* empty */ }; +{% include "_common/controls.conf.j2" %} options { query-source address 10.53.0.2; diff --git a/bin/tests/system/stress/ns4/named.conf.j2 b/bin/tests/system/stress/ns4/named.conf.j2 index 7b1efc1a94b..92a527165c7 100644 --- a/bin/tests/system/stress/ns4/named.conf.j2 +++ b/bin/tests/system/stress/ns4/named.conf.j2 @@ -1,4 +1,4 @@ -controls { /* empty */ }; +{% include "_common/controls.conf.j2" %} options { query-source address 10.53.0.4;