If prepub > retire, prepub now

Catch a case where if the prepublication time of the successor key
is later than the retire time of the predecessor. If that is the
case we should prepublish as soon as possible, a.k.a. now.

diff --git a/lib/dns/keymgr.c b/lib/dns/keymgr.c
index 87abec4e704c7e8a819edaaa6b52144a24f69ca5..e5f1860c25e33ea7a0c44c9cc7c51181c29b53a0 100644 (file)
--- a/lib/dns/keymgr.c
+++ b/lib/dns/keymgr.c
@@ -287,6 +287,10 @@ keymgr_prepublication_time(dns_dnsseckey_t *key, dns_kasp_t *kasp,
        /*
         * Publish successor 'prepub' time before the 'retire' time of 'key'.
         */
+       if (prepub > retire) {
+               /* We should have already prepublished the new key. */
+               return (now);
+       }
        return (retire - prepub);
 }