From: Mark Andrews <marka@isc.org>
Date: Thu, 27 Dec 2018 02:44:16 +0000 (+1100)
Subject: update refreshkeytime
X-Git-Tag: v9.13.6~64^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ca977e39767902612498776db4609456b600d108;p=thirdparty%2Fbind9.git

update refreshkeytime
---

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 7de2e58e643..5a22e779988 100644
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -9897,6 +9897,7 @@ zone_refreshkeys(dns_zone_t *zone) {
 	isc_stdtime_t now;
 	bool commit = false;
 	bool fetching = false, fetch_err = false;
+	bool timerset = false;
 
 	ENTER;
 	REQUIRE(zone->db != NULL);
@@ -9962,6 +9963,9 @@ zone_refreshkeys(dns_zone_t *zone) {
 			/* Or do we just need to refresh the keyset? */
 			if (timer > kd.refresh)
 				timer = kd.refresh;
+
+			set_refreshkeytimer(zone, &kd, now, false);
+			timerset = true;
 		}
 
 		if (timer > now)
@@ -10066,6 +10070,8 @@ zone_refreshkeys(dns_zone_t *zone) {
 		isc_time_formattimestamp(&zone->refreshkeytime, timebuf, 80);
 		dns_zone_log(zone, ISC_LOG_DEBUG(1), "retry key refresh: %s",
 			     timebuf);
+	} else if (!timerset) {
+		isc_time_settoepoch(&zone->refreshkeytime);
 	}
 
 	if (!fetching)