892. [bug] The server could attempt to refresh a zone that

                        was being loaded, causing an assertion failure.
                        [RT #1335]
(was fixed on mainline in zone.c 1.300)

diff --git a/CHANGES b/CHANGES
index 8548fffb93e062c08826695473e6792612b59c67..12ecfd942fa28c72fd042fb8f92eb81f866bc28f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+
+ 892.  [bug]           The server could attempt to refresh a zone that
+                       was being loaded, causing an assertion failure.
+                       [RT #1335]
+
  891.  [bug]           Return an error when a SIG(0) signed response to
                        an unsigned query is seen.  This should actually
                        do the verification, but it's not currently

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index a9a5e2e5b190f1ad9d26121e973cc195a3c18915..602df2b0820fe4e053077ac0925ff67ed3b68ac2 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.13 2001/05/21 17:50:00 gson Exp $ */
+/* $Id: zone.c,v 1.283.2.14 2001/06/08 21:46:11 gson Exp $ */
 
 #include <config.h>
 
@@ -3696,7 +3696,8 @@ zone_settimer(dns_zone_t *zone, isc_stdtime_t now) {
        case dns_zone_stub:
                if (!DNS_ZONE_FLAG(zone, DNS_ZONEFLG_REFRESH) &&
                    !DNS_ZONE_FLAG(zone, DNS_ZONEFLG_NOMASTERS) &&
-                   !DNS_ZONE_FLAG(zone, DNS_ZONEFLG_NOREFRESH)) {
+                   !DNS_ZONE_FLAG(zone, DNS_ZONEFLG_NOREFRESH) &&
+                   !DNS_ZONE_FLAG(zone, DNS_ZONEFLG_LOADING)) {
                        INSIST(zone->refreshtime != 0);
                        if (zone->refreshtime < next || next == 0)
                                next = zone->refreshtime;