From: Mark Andrews <marka@isc.org>
Date: Tue, 23 Jan 2018 20:59:07 +0000 (+1100)
Subject: 4874.   [bug]           Wrong time display when reporting new keywarntime.
X-Git-Tag: v9.11.3b1~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7cbac360bf98c0a52b2d6866ad887616c32d4d3a;p=thirdparty%2Fbind9.git

4874.   [bug]           Wrong time display when reporting new keywarntime.
                        [RT #47042]

(cherry picked from commit 83d005de61c6153cfd9fac957ac2cd2863419e7d)
---

diff --git a/CHANGES b/CHANGES
index 7cae81d48a2..e9f1d6b95c5 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 c04e807c111..3a8af67f5b1 100644
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -6087,7 +6087,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);
 	}