upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-11 11:19:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch '784-bind-9-12-3-p1-fatal-error' into 'master'

Browse source 
Resolve "bind 9.12.3-P1 fatal error"

Closes #784

See merge request isc-projects/bind9!1283
This commit is contained in:
Mark Andrews 2019-01-09 03:46:43 -05:00
commit f9d9c5686d
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGES
View file

@ -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]

6
lib/dns/zone.c
View file

@ -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)