Remove redundant nzf_remove() call during delzone (#39844)

diff --git a/CHANGES b/CHANGES
index 1d02ba214a3b6892ddd73479bb5816a93af5a3ed..b9c17a0e735bb5a4d41579f8308fdcb787ebc040 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4140.  [cleanup]       Remove redundant nzf_remove() call during delzone.
+                       [RT #39844]
+
 4139.  [doc]           fix rpz-client-ip documentation [RT #39783]
 
 4138.  [bug]           An uninitialized value in validator.c could result

diff --git a/bin/named/server.c b/bin/named/server.c
index 39f00e6cb5177a19b576b7c7bbf404e9755b4601..9db6caa48dfe8a1e4b83cc535de28d4572abbb9a 100644 (file)
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -9729,11 +9729,6 @@ ns_server_delzone(ns_server_t *server, char *args, isc_buffer_t **text) {
                dns_zone_unload(zone);
        }
 
-       /* Remove the zone from the new_zone_file if applicable */
-       added = dns_zone_getadded(zone);
-       if (added && view->new_zone_file != NULL)
-               CHECK(nzf_remove(view->new_zone_file, view->name, zonename));
-
        /* Clean up stub / slave zone files */
        dns_zone_getraw(zone, &raw);
        mayberaw = (raw != NULL) ? raw : zone;