pullup:

 719.   [bug]           Rapid reloads could trigger an assertion failure.
                        [RT #743]

diff --git a/CHANGES b/CHANGES
index 184cf30a294754c1b90b6146936ff1a91c53ce11..3750062cd9c516800f20f94fbfe6264bfd13681a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,7 @@
 
+ 719.  [bug]           Rapid reloads could trigger an assertion failure.
+                       [RT #743]
+
  717.  [bug]           Certain TKEY processing failure modes could
                        reference an uninitialized variable, causing the
                        server to crash. [RT #750]

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 593bc623275265eca77619e9d6a169ad13731bb0..563131faa6a831a6e29f58a8aa7ea9bda40f1f64 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zone.c,v 1.283.2.6 2001/01/24 00:17:26 bwelling Exp $ */
+/* $Id: zone.c,v 1.283.2.7 2001/01/31 18:04:45 gson Exp $ */
 
 #include <config.h>
 
@@ -893,6 +893,11 @@ dns_zone_load(dns_zone_t *zone) {
 
        INSIST(zone->type != dns_zone_none);
 
+       if (DNS_ZONE_FLAG(zone, DNS_ZONEFLG_LOADING)) {
+               result = ISC_R_SUCCESS;
+               goto cleanup;
+       }
+
        if (zone->db != NULL && zone->masterfile == NULL) {
                /*
                 * The zone has no master file configured, but it already