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

                        dns_zone_setmasterswithkeys(). [RT #26732]

diff --git a/CHANGES b/CHANGES
index 87f08a4c16927e9ece01740ee06ffbe9f393f855..8f366bf48abefc443cda8b4faac9bf650f604ef1 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -37,6 +37,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.8.2 released ---
 
 3298.  [bug]           Named could dereference a NULL pointer in
@@ -97,9 +100,9 @@
 3274.  [bug]           Log when a zone is not reusable.  Only set loadtime
                        on successful loads.  [RT #27650]
 
-3273.   [bug]           AAAA responses could be returned in the additional
-                        section even when filter-aaaa-on-v4 was in use.
-                        [RT #27292]
+3273.  [bug]           AAAA responses could be returned in the additional
+                       section even when filter-aaaa-on-v4 was in use.
+                       [RT #27292]
 
 3271.  [port]          darwin: mksymtbl is not always stable, loop several
                        times before giving up.  mksymtbl was using non

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 5c82b4c985c4ff4c11636f5ce918112ef85c50df..22870dc47b6a5901544d0165b81615a361bbedc4 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -4449,6 +4449,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;