From: Mukund Sivaraman <muks@isc.org>
Date: Tue, 23 Jun 2015 08:09:01 +0000 (+0530)
Subject: Remove redundant nzf_remove() call during delzone (#39844)
X-Git-Tag: v9.11.0a1~718
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d14c2683625c5db500ab93fb7176a9570798ca1e;p=thirdparty%2Fbind9.git

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

diff --git a/CHANGES b/CHANGES
index 1d02ba214a3..b9c17a0e735 100644
--- 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 39f00e6cb51..9db6caa48df 100644
--- 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;