Only log "new successor in ..." if prepub != 0
If 'prepub' is 0, this has the special meaning that no rollover is
scheduled. If so, don't log "new successor in x seconds".
(cherry picked from commit 955a69109e)
This commit is contained in:
@@ -1669,7 +1669,7 @@ keymgr_key_rollover(dns_kasp_key_t *kaspkey, dns_dnsseckey_t *active_key,
|
||||
*/
|
||||
prepub = keymgr_prepublication_time(active_key, kasp, lifetime,
|
||||
now);
|
||||
if (prepub == 0 || prepub > now) {
|
||||
if (prepub > now) {
|
||||
if (isc_log_wouldlog(dns_lctx, ISC_LOG_DEBUG(1))) {
|
||||
dst_key_format(active_key->key, keystr,
|
||||
sizeof(keystr));
|
||||
@@ -1682,7 +1682,8 @@ keymgr_key_rollover(dns_kasp_key_t *kaspkey, dns_dnsseckey_t *active_key,
|
||||
keystr, keymgr_keyrole(active_key->key),
|
||||
dns_kasp_getname(kasp), (prepub - now));
|
||||
}
|
||||
|
||||
}
|
||||
if (prepub == 0 || prepub > now) {
|
||||
/* No need to start rollover now. */
|
||||
if (*nexttime == 0 || prepub < *nexttime) {
|
||||
*nexttime = prepub;
|
||||
|
||||
Reference in New Issue
Block a user