3232. [bug] Zero zone->curmaster before return in

                        dns_zone_setmasterswithkeys(). [RT #26732]

diff --git a/CHANGES b/CHANGES
index 044c6913a3996025e8ccaa111ef6e7b3a97c0b8e..ac33e56f427652f99f8f579cac43af5e3ada90fd 100644 (file)
--- 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 388efd788358bb329583db522d1f5c3e0ea13dd4..329fbef3192496559d681b2ec62f473781c06d2e 100644 (file)
--- 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;