From: Nicki Křížek <nicki@isc.org>
Date: Wed, 8 Jul 2026 18:36:20 +0000 (+0000)
Subject: Mark the configs that deliberately keep a custom controls config
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=b2bf286f24457eec2c6f3a02f6fc63b7c33e5ca0;p=thirdparty%2Fbind9.git

Mark the configs that deliberately keep a custom controls config

Every remaining deviation from the shared _common/controls.conf.j2
include is intentional; annotate each with a one-line grep-able
comment stating why:

- rndc/ns2 and ns5 test multi-key and read-only channels; ns4 gets a
  runtime-generated multi-key channel appended by setup.sh;
- resolver/ns9 runs an IPv6-only channel, which the IPv4-only shared
  template cannot express;
- shutdown/resolver lives in a non-ns<N> directory, so the template's
  ns.ip variable is not injected there.

Assisted-by: Claude:claude-fable-5
---

diff --git a/bin/tests/system/resolver/ns9/named.conf.j2 b/bin/tests/system/resolver/ns9/named.conf.j2
index ea71df45dc3..2ad6945f575 100644
--- a/bin/tests/system/resolver/ns9/named.conf.j2
+++ b/bin/tests/system/resolver/ns9/named.conf.j2
@@ -19,6 +19,7 @@ key rndc_key {
 	algorithm @DEFAULT_HMAC@;
 };
 
+/* deliberately not _common/controls.conf.j2: IPv6 control channel; the shared template is IPv4-only */
 controls {
 	inet fd92:7065:b8e:ffff::9 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
 };
diff --git a/bin/tests/system/rndc/ns2/named.conf.j2 b/bin/tests/system/rndc/ns2/named.conf.j2
index eac6dcddb11..dca29075a27 100644
--- a/bin/tests/system/rndc/ns2/named.conf.j2
+++ b/bin/tests/system/rndc/ns2/named.conf.j2
@@ -18,6 +18,7 @@ key secondkey {
 	algorithm @DEFAULT_HMAC@;
 };
 
+/* deliberately not _common/controls.conf.j2: multi-key control channel is the test subject */
 controls {
 	inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; secondkey; };
 };
diff --git a/bin/tests/system/rndc/ns4/named.conf.j2 b/bin/tests/system/rndc/ns4/named.conf.j2
index 02e58eb4798..4e89362ba62 100644
--- a/bin/tests/system/rndc/ns4/named.conf.j2
+++ b/bin/tests/system/rndc/ns4/named.conf.j2
@@ -1,3 +1,4 @@
+/* deliberately not _common/controls.conf.j2: setup.sh appends a runtime-generated multi-key channel on EXTRAPORT7 */
 options {
 	port @PORT@;
 	pid-file "named.pid";
diff --git a/bin/tests/system/rndc/ns5/named.conf.j2 b/bin/tests/system/rndc/ns5/named.conf.j2
index a33741a686b..15bb0e7f882 100644
--- a/bin/tests/system/rndc/ns5/named.conf.j2
+++ b/bin/tests/system/rndc/ns5/named.conf.j2
@@ -12,6 +12,7 @@ key rndc_key {
 	algorithm @DEFAULT_HMAC@;
 };
 
+/* deliberately not _common/controls.conf.j2: read-only control channel is the test subject */
 controls {
 	inet 10.53.0.5 port @CONTROLPORT@ allow { any; } keys { rndc_key; } read-only yes;
 };
diff --git a/bin/tests/system/shutdown/resolver/named.conf.j2 b/bin/tests/system/shutdown/resolver/named.conf.j2
index da4fc493553..f78c7947192 100644
--- a/bin/tests/system/shutdown/resolver/named.conf.j2
+++ b/bin/tests/system/shutdown/resolver/named.conf.j2
@@ -12,6 +12,7 @@ key rndc_key {
 	algorithm @DEFAULT_HMAC@;
 };
 
+/* deliberately not _common/controls.conf.j2: non-ns<N> directory without the ns.ip template variable */
 controls {
 	inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
 };