Accept patch from RedHat (RT #26732).

diff --git a/CHANGES b/CHANGES
index 9993efd1b8a998bc4e43b2bb61872b3bc5be9a8b..c85dfdc551c77d03b9c12345f97bf6d7e2bd3f37 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+3232.  [bug]           Zero zone->curmaster before return in
+                       dns_zone_setmasterswithkeys(). [RT #26732]
+
 3231.  [bug]           named could fail to send a uncompressable zone.
                        [RT #26796]
 

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 54f2764d73c8dbab0bc4f3ca395e12b78191b1fe..59d8985f7017de187c3a7fb7f95a42f2b5e021dc 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zone.c,v 1.648 2011/11/28 03:14:58 marka Exp $ */
+/* $Id: zone.c,v 1.649 2011/12/01 15:58:46 smann Exp $ */
 
 /*! \file */
 
@@ -4732,6 +4732,7 @@ dns_zone_setmasterswithkeys(dns_zone_t *zone,
        /*
         * Everything is ok so attach to the zone.
         */
+       zone->curmaster = 0;
        zone->mastersok = newok;
        zone->masters = newaddrs;
        zone->masterkeynames = newnames;