3654. [bug] Address race condition with manual notify requests.

                        [RT #34806]

(cherry picked from commit 5116f25421090dffe637eb8f6cf7b44acd83678b)

diff --git a/CHANGES b/CHANGES
index 81d8b4feb8dd230b9c6f56396528d007632cefd0..0285da841507fde4a405c515e292b70354c773f9 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+3654.  [bug]           Address race condition with manual notify requests.
+                       [RT #34806]
+
 3653.  [func]          Create delegations for all "children" of empty zones
                        except "forward first". [RT #34826]
 

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 187caf744cf3bc7eee39c11b57066693fe574015..5e305d574d251ab528397c0e7c561c996cfb8177 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -8732,10 +8732,10 @@ zone_settimer(dns_zone_t *zone, isc_time_t *now) {
                            isc_time_compare(&zone->refreshtime, &next) < 0)
                                next = zone->refreshtime;
                }
-               if (DNS_ZONE_FLAG(zone, DNS_ZONEFLG_LOADED)) {
-                       INSIST(!isc_time_isepoch(&zone->expiretime));
+               if (DNS_ZONE_FLAG(zone, DNS_ZONEFLG_LOADED) &&
+                   !isc_time_isepoch(&zone->expiretime)) {
                        if (isc_time_isepoch(&next) ||
-                           isc_time_compare(&zone->expiretime, &next) < 0)
+                            isc_time_compare(&zone->expiretime, &next) < 0)
                                next = zone->expiretime;
                }
                if (DNS_ZONE_FLAG(zone, DNS_ZONEFLG_NEEDDUMP) &&