From: Aram Sargsyan <aram@isc.org>
Date: Tue, 28 Dec 2021 12:08:48 +0000 (+0000)
Subject: Improve the zones' view reverting logic when a zone is a catalog zone
X-Git-Tag: v9.19.0~146^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2fd967136ad014f6d7456c1e19e185803f7d99ac;p=thirdparty%2Fbind9.git

Improve the zones' view reverting logic when a zone is a catalog zone

When a zone is being configured with a new view, the catalog zones
structure will also be linked to that view. Later on, in case of some
error, should the zone be reverted to the previous view, the link
between the catalog zones structure and the view won't be reverted.

Change the dns_zone_setviewrevert() function so it calls
dns_zone_catz_enable() during a zone revert, which will reset the
link between `catzs` and view.
---

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 60abf7dbb40..ca9bbaec4c0 100644
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -1683,6 +1683,9 @@ dns_zone_setviewrevert(dns_zone_t *zone) {
 		dns_zone_setview_helper(zone, zone->prev_view);
 		dns_view_weakdetach(&zone->prev_view);
 	}
+	if (zone->catzs != NULL) {
+		zone_catz_enable(zone, zone->catzs);
+	}
 	if (inline_secure(zone)) {
 		dns_zone_setviewrevert(zone->raw);
 	}