From: Mark Andrews <marka@isc.org>
Date: Wed, 29 Jul 2020 13:36:03 +0000 (+1000)
Subject: Update-policy 'subdomain' was incorrectly treated as 'zonesub'
X-Git-Tag: v9.17.4~6^2~3
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=952955aa4c7dc53b92b5ee3f8545990aa113cc90;p=thirdparty%2Fbind9.git

Update-policy 'subdomain' was incorrectly treated as 'zonesub'

resulting in names outside the specified subdomain having the wrong
restrictions for the given key.
---

diff --git a/bin/named/zoneconf.c b/bin/named/zoneconf.c
index 8abbbc462b1..39ef13fdcfa 100644
--- a/bin/named/zoneconf.c
+++ b/bin/named/zoneconf.c
@@ -252,7 +252,8 @@ configure_zone_ssutable(const cfg_obj_t *zconfig, dns_zone_t *zone,
 
 		str = cfg_obj_asstring(matchtype);
 		CHECK(dns_ssu_mtypefromstring(str, &mtype));
-		if (mtype == dns_ssumatchtype_subdomain) {
+		if (mtype == dns_ssumatchtype_subdomain &&
+		    strcasecmp(str, "zonesub") == 0) {
 			usezone = true;
 		}