From: Matthijs Mekking <matthijs@isc.org>
Date: Fri, 13 Mar 2026 10:56:31 +0000 (+0100)
Subject: Don't call dns_zone_setadded() on modify
X-Git-Tag: v9.21.21~36^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=780872e07eaa735c215765da570d2f1f78bfade7;p=thirdparty%2Fbind9.git

Don't call dns_zone_setadded() on modify

If we are modifiying the zone, the zone must have been added before.
Don't overwrite this value on modifications.

Also it feels cleaner to pass added=false to configure_zone() in
do_modzone().
---

diff --git a/bin/named/server.c b/bin/named/server.c
index 8d857eaa60c..dcc2cfe40f1 100644
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -6250,7 +6250,9 @@ configure_zone(const cfg_obj_t *config, const cfg_obj_t *zconfig,
 	/*
 	 * Mark whether the zone was originally added at runtime or not
 	 */
-	dns_zone_setadded(zone, added);
+	if (!modify) {
+		dns_zone_setadded(zone, added);
+	}
 
 	/*
 	 * Determine if we need to set up inline signing.
@@ -13057,7 +13059,7 @@ do_modzone(named_server_t *server, dns_view_t *view, dns_name_t *name,
 	dns_view_thaw(view);
 	result = configure_zone(server->effectiveconfig, zoneobj,
 				view->newzone.vconfig, view, &server->viewlist,
-				&server->kasplist, server->aclctx, true, false,
+				&server->kasplist, server->aclctx, false, false,
 				false, true);
 	dns_view_freeze(view);