From: Colin Vidal <colin@isc.org>
Date: Wed, 19 Nov 2025 16:34:16 +0000 (+0100)
Subject: allow named remote-servers list with key or tls
X-Git-Tag: v9.21.16~18^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=046c6819b24ebd7d087ed33518b71b0ff23d9918;p=thirdparty%2Fbind9.git

allow named remote-servers list with key or tls

The remote-servers clause enables the following pattern:

	remote-servers a { 1.2.3.4; ... };
	remote-servers b { a key foo; };

However, `check.c` was explicitly throwing an error if a `key` or `tls`
was provided after a named server-list. Remove this check, as this is a
valid use case.
---

diff --git a/lib/isccfg/check.c b/lib/isccfg/check.c
index f8c16974579..022e29d0dad 100644
--- a/lib/isccfg/check.c
+++ b/lib/isccfg/check.c
@@ -2494,20 +2494,6 @@ resume:
 			}
 			continue;
 		}
-		if (!cfg_obj_isvoid(key)) {
-			cfg_obj_log(key, ISC_LOG_ERROR, "unexpected token '%s'",
-				    cfg_obj_asstring(key));
-			if (result == ISC_R_SUCCESS) {
-				result = ISC_R_FAILURE;
-			}
-		}
-		if (!cfg_obj_isvoid(tls)) {
-			cfg_obj_log(key, ISC_LOG_ERROR, "unexpected token '%s'",
-				    cfg_obj_asstring(tls));
-			if (result == ISC_R_SUCCESS) {
-				result = ISC_R_FAILURE;
-			}
-		}
 		listname = cfg_obj_asstring(addr);
 		symvalue.as_cpointer = addr;
 		tresult = isc_symtab_define(symtab, listname, 1, symvalue,