From ca977e39767902612498776db4609456b600d108 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Thu, 27 Dec 2018 13:44:16 +1100 Subject: [PATCH 1/2] update refreshkeytime --- lib/dns/zone.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/dns/zone.c b/lib/dns/zone.c index 7de2e58e64..5a22e77998 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) From 9dd39d53853e6afb7b042cf4ee1e4f9bbdb2efac Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Thu, 27 Dec 2018 13:47:08 +1100 Subject: [PATCH 2/2] add CHANGES --- CHANGES | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGES b/CHANGES index 5bbc37fbd2..e8968f411d 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,6 @@ +5128. [bug] Refreshkeytime was not being updated for managed + keys zones. [GL #784] + 5127. [bug] rcode.c:maybe_numeric failed to handle NUL in text regions. [GL #807]