30 lines
905 B
Diff
30 lines
905 B
Diff
|
From e4cccf9668c7adee4724a7649ec64685f82c8677 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Mark Andrews <marka@isc.org>
|
||
|
|
Date: Wed, 29 Jul 2020 23:36:03 +1000
|
||
|
|
Subject: [PATCH] Update-policy 'subdomain' was incorrectly treated as
|
||
|
|
'zonesub'
|
||
|
|
|
||
|
|
resulting in names outside the specified subdomain having the wrong
|
||
|
|
restrictions for the given key.
|
||
|
|
---
|
||
|
|
bin/named/zoneconf.c | 3 ++-
|
||
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/bin/named/zoneconf.c b/bin/named/zoneconf.c
|
||
|
|
index 55f191bad4..b77a07c14a 100644
|
||
|
|
--- a/bin/named/zoneconf.c
|
||
|
|
+++ b/bin/named/zoneconf.c
|
||
|
|
@@ -239,7 +239,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;
|
||
|
|
}
|
||
|
|
|
||
|
|
--
|
||
|
|
GitLab
|
||
|
|
|