From: Mark Andrews <marka@isc.org>
Date: Mon, 2 Mar 2020 23:50:06 +0000 (+1100)
Subject: Restart zone maintenance if it had been stalled.
X-Git-Tag: v9.14.12~20^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=08b625787bf311e5d9d4455bcf92ecec49db7857;p=thirdparty%2Fbind9.git

Restart zone maintenance if it had been stalled.

(cherry picked from commit f171347b5f27c1b0dfe1ef935512b20a820901c9)
---

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 88f56eb4811..9bca77a03cf 100644
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -5128,6 +5128,14 @@ zone_postload(dns_zone_t *zone, dns_db_t *db, isc_time_t loadtime,
 	    DNS_ZONE_FLAG(zone->secure, DNS_ZONEFLG_LOADED))
 	{
 		DNS_ZONE_CLRFLAG(zone->secure, DNS_ZONEFLG_LOADPENDING);
+		/*
+		 * Re-start zone maintenance if it had been stalled
+		 * due to DNS_ZONEFLG_LOADPENDING being set when
+		 * zone_maintenance was called.
+		 */
+		if (zone->secure->task != NULL) {
+			zone_settimer(zone->secure, &now);
+		}
 	}
 
 	zone_debuglog(zone, "zone_postload", 99, "done");