From: Mark Andrews <marka@isc.org>
Date: Thu, 27 Feb 2020 06:43:26 +0000 (+1100)
Subject: Always call zone_settimer()
X-Git-Tag: v9.14.12~21^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f65514579c5d52d219aae17601ef2a78263a5f8a;p=thirdparty%2Fbind9.git

Always call zone_settimer()

zone_needdump() could potentially not call zone_settimer() so
explitly call zone_settimer() as zone->resigntime could have
gone backward.

(cherry picked from commit 5ec57f31b0cca77f2629bac888c323cd619979ee)
---

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index f4d67e22f25..332f18f0b87 100644
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -10658,8 +10658,14 @@ dns_zone_markdirty(dns_zone_t *zone) {
 		}
 
 		/* XXXMPA make separate call back */
-		if (result == ISC_R_SUCCESS)
+		if (result == ISC_R_SUCCESS) {
 			set_resigntime(zone);
+			if (zone->task != NULL) {
+				isc_time_t now;
+				TIME_NOW(&now);
+				zone_settimer(zone, &now);
+			}
+		}
 	}
 	if (secure != NULL)
 		UNLOCK_ZONE(secure);