From: Matthijs Mekking <matthijs@isc.org>
Date: Thu, 28 May 2026 13:13:26 +0000 (+0200)
Subject: When configuring zone ACL, check template too
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=470847a527d8b4091b5ffc7532e6f6945e3adc80;p=thirdparty%2Fbind9.git

When configuring zone ACL, check template too

When zone templates were introduced, we forgot to add parsing ACL
from templates in 'configure_zone_acl()'. This commit fixes the
omission.
---

diff --git a/bin/named/zoneconf.c b/bin/named/zoneconf.c
index cc300845bea..89846353f57 100644
--- a/bin/named/zoneconf.c
+++ b/bin/named/zoneconf.c
@@ -139,8 +139,14 @@ configure_zone_acl(const cfg_obj_t *zconfig, const cfg_obj_t *vconfig,
 	if (config != NULL && maps[i] != NULL) {
 		const cfg_obj_t *toptions = named_zone_templateopts(config,
 								    maps[i]);
+		/* Check to see if ACL is defined within template */
 		if (toptions != NULL) {
 			maps[i++] = toptions;
+			(void)cfg_map_get(toptions, aclname, &aclobj);
+			if (aclobj != NULL) {
+				aclp = NULL;
+				goto parse_acl;
+			}
 		}
 	}