]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
allow named remote-servers list with key or tls
authorColin Vidal <colin@isc.org>
Wed, 19 Nov 2025 16:34:16 +0000 (17:34 +0100)
committerColin Vidal <colin@isc.org>
Fri, 28 Nov 2025 08:10:53 +0000 (09:10 +0100)
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.

lib/isccfg/check.c

index f8c169745790d5663a3c4d5b8c855282dc22c806..022e29d0dad7e6368d1cde8b5bf7e7aa5a2829ec 100644 (file)
@@ -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,