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.17.1~87^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ec57f31b0cca77f2629bac888c323cd619979ee;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.
---

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index baddd91a584..52e2b8a767a 100644
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -11088,6 +11088,11 @@ again:
 		/* XXXMPA make separate call back */
 		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) {