From: Mark Andrews <marka@isc.org>
Date: Fri, 27 Apr 2012 11:06:01 +0000 (+1000)
Subject: 3232.   [bug]           Zero zone->curmaster before return in
X-Git-Tag: v9.6-ESV-R7~22
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=453a4b6c3a0c3747c5702bb0c605f28cfbcc7bfa;p=thirdparty%2Fbind9.git

3232.   [bug]           Zero zone->curmaster before return in
                        dns_zone_setmasterswithkeys(). [RT #26732]
---

diff --git a/CHANGES b/CHANGES
index 044c6913a39..ac33e56f427 100644
--- a/CHANGES
+++ b/CHANGES
@@ -26,6 +26,9 @@
 3299.	[bug]		Make SDB handle errors from database drivers better.
 			[RT #28534]
 
+3232.	[bug]		Zero zone->curmaster before return in
+			dns_zone_setmasterswithkeys(). [RT #26732]
+
 	--- 9.6-ESV-R6 released ---
 
 3298.	[bug]		Named could dereference a NULL pointer in
diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 388efd78835..329fbef3192 100644
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -3483,6 +3483,7 @@ dns_zone_setmasterswithkeys(dns_zone_t *zone,
 	/*
 	 * Everything is ok so attach to the zone.
 	 */
+	zone->curmaster = 0;
 	zone->masters = new;
 	zone->mastersok = newok;
 	zone->masterkeynames = newname;