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

                        [RT #47042]

(cherry picked from commit 83d005de61c6153cfd9fac957ac2cd2863419e7d)

diff --git a/CHANGES b/CHANGES
index 86d97b78aa8ba6a6d144b4a071f7a907140d995f..05221a88256d765472ea60dfef498ebd6f2225cc 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4874.  [bug]           Wrong time display when reporting new keywarntime.
+                       [RT #47042]
+
 4872.  [bug]           Don't permit loading meta RR types such as TKEY
                        from master files. [RT #47009]
 

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 2387489148fd89642552407cd1561efdff57234e..3566e8764d2adbe2b4afc4821f3b2f051d796fb5 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -5994,7 +5994,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);
        }