From 83d005de61c6153cfd9fac957ac2cd2863419e7d Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Wed, 24 Jan 2018 07:59:07 +1100 Subject: [PATCH] 4874. [bug] Wrong time display when reporting new keywarntime. [RT #47042] --- CHANGES | 3 +++ lib/dns/zone.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 42254ec2b9..e21066917a 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,6 @@ +4874. [bug] Wrong time display when reporting new keywarntime. + [RT #47042] + 4873. [doc] Grammars for named.conf included in the ARM are now automatically generated by the configuration parser itself. As a side effect of the work needed to diff --git a/lib/dns/zone.c b/lib/dns/zone.c index 4469ad35ab..ed9ae40c7c 100644 --- a/lib/dns/zone.c +++ b/lib/dns/zone.c @@ -6123,7 +6123,7 @@ set_key_expiry_warning(dns_zone_t *zone, isc_stdtime_t when, isc_stdtime_t now) isc_time_set(&zone->keywarntime, when - delta, 0); } else { isc_time_set(&zone->keywarntime, when - 7 * 24 * 3600, 0); - isc_time_formattimestamp(&zone->refreshkeytime, timebuf, 80); + isc_time_formattimestamp(&zone->keywarntime, timebuf, 80); dns_zone_log(zone, ISC_LOG_NOTICE, "setting keywarntime to %s", timebuf); }