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

                        [RT #47042]

(cherry picked from commit 83d005de61c6153cfd9fac957ac2cd2863419e7d)

diff --git a/CHANGES b/CHANGES
index 7cae81d48a263e8854508451d82577d642e93a59..e9f1d6b95c598f2296cd7cd8563a56a5bea96557 100644 (file)
--- 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 c04e807c111625625df6cb31d41a85e4de3c0db4..3a8af67f5b12685f904a5dbe7c78270d76976823 100644 (file)
--- 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);
        }