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 0c5f65ae4fd4e79185383f7ca3cd2eb21b2ded29..a72765fa7a1cee156b9b89dd7a000afa2fbf3c0e 100644 (file)
--- 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 7f7e946e3407f64fcba8d7c2e5086d5d734f1fa4..8cf3b7ff3af2c28e40947f8c53568c3e10115c61 100644 (file)
--- 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 1ebb38810a6dba4a501445eb01913b4f4f5c4d1f..7567b78dbb6b79c81ddd563ee748be9d02ffddba 100644 (file)
--- 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 3a6fa3c6406b5b7e57bde52e626e40c1737ca79a..6164730bd303806857d5dfc8c4e0d69f48febb9d 100644 (file)
--- 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 dba8ca265efed7e43bc74e41a743f29d628cdc33..a20573f91cc3ee5bd8f630d93ca9382d9b534d73 100644 (file)
--- 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 7f7e946e3407f64fcba8d7c2e5086d5d734f1fa4..8cf3b7ff3af2c28e40947f8c53568c3e10115c61 100644 (file)
--- 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 775ed0175fd18ee744b038e9d239159dd7f7250d..eb2404657d7041f24d206b8928f47589e951fec9 100644 (file)
--- 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 66ea18356d28199d3046098d894e34a94fe1aeb4..381484dfb7015244f12a79bc666ea2e90b7d6b0c 100644 (file)
--- 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 7f7e946e3407f64fcba8d7c2e5086d5d734f1fa4..8cf3b7ff3af2c28e40947f8c53568c3e10115c61 100644 (file)
--- 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 775ed0175fd18ee744b038e9d239159dd7f7250d..eb2404657d7041f24d206b8928f47589e951fec9 100644 (file)
--- 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 66ea18356d28199d3046098d894e34a94fe1aeb4..381484dfb7015244f12a79bc666ea2e90b7d6b0c 100644 (file)
--- 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 017545453cac2030f86c7e95979e99e983ce9913..8e46b4b7924ef69dc735df4406cda9dd9d5588d7 100644 (file)
--- 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 ad39b8d9c07fa68cf1a922bbb428f560d2e866c2..06cb694e9e3d5c1cc09d4b5e0a2ca8b29bb290fc 100644 (file)
--- 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 6e65ca8be5d1212a181aca61d678fbab3c64e0d6..cd47702373d81666fb07f4f167cfc1ad0216756f 100644 (file)
--- 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 7b1efc1a94b60329c6d4169f847738b7045cabae..92a527165c78dbf3f1ba7cf93fa2e1a6ef990fc5 100644 (file)
--- 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;