From: Nicki Křížek <nicki@isc.org>
Date: Wed, 8 Jul 2026 18:06:19 +0000 (+0000)
Subject: Fix controls statements bound to another instance's address
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=fec466a989282b8aec8c218ab61488cc9bf71ec2;p=thirdparty%2Fbind9.git

Fix controls statements bound to another instance's address

Some of the system test named configs had a mismatched control channel
IP address. As there is no evidence this was intentional (no uses of the
control channel), it was most likely introduced as a copy-paste bug. Fix
the control channel IP to match the instance number.

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

diff --git a/bin/tests/system/rpzextra/ns2/named.conf.j2 b/bin/tests/system/rpzextra/ns2/named.conf.j2
index a888e3a45b9..51e748c7dc0 100644
--- a/bin/tests/system/rpzextra/ns2/named.conf.j2
+++ b/bin/tests/system/rpzextra/ns2/named.conf.j2
@@ -4,7 +4,7 @@ key rndc_key {
 };
 
 controls {
-	inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
+	inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
 };
 
 options {
diff --git a/bin/tests/system/shutdown/ns2/named.conf.j2 b/bin/tests/system/shutdown/ns2/named.conf.j2
index f637cbe935f..fbe71161fff 100644
--- a/bin/tests/system/shutdown/ns2/named.conf.j2
+++ b/bin/tests/system/shutdown/ns2/named.conf.j2
@@ -4,7 +4,7 @@ key rndc_key {
 };
 
 controls {
-	inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
+	inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
 };
 
 options {
diff --git a/bin/tests/system/sig0/ns1/named.conf.j2 b/bin/tests/system/sig0/ns1/named.conf.j2
index 4dbddd9e007..3196e19536e 100644
--- a/bin/tests/system/sig0/ns1/named.conf.j2
+++ b/bin/tests/system/sig0/ns1/named.conf.j2
@@ -16,7 +16,7 @@ key rndc_key {
 };
 
 controls {
-	inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
+	inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
 };
 
 view "v1" {
diff --git a/bin/tests/system/ttl/ns2/named.conf.j2 b/bin/tests/system/ttl/ns2/named.conf.j2
index 62f1c319cc7..4b17e1b2cd4 100644
--- a/bin/tests/system/ttl/ns2/named.conf.j2
+++ b/bin/tests/system/ttl/ns2/named.conf.j2
@@ -23,7 +23,7 @@ key rndc_key {
 };
 
 controls {
-	inet 10.53.0.3 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
+	inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
 };
 
 zone "." { type hint; file "hints.db"; };