From: Andreas Gustafsson <source@isc.org>
Date: Fri, 8 Jun 2001 21:46:11 +0000 (+0000)
Subject:  892.   [bug]           The server could attempt to refresh a zone that
X-Git-Tag: v9.1.3rc2~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=011d895d6880daf125a1bd81c088810d140c730a;p=thirdparty%2Fbind9.git

 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 8548fffb93e..12ecfd942fa 100644
--- 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 a9a5e2e5b19..602df2b0820 100644
--- 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;