Skip to content
Snippets Groups Projects
Commit f426fb0b authored by Daniel Salzman's avatar Daniel Salzman
Browse files

Merge branch 'timer_created' into 'master'

dnssec: fixes around timer Created:

See merge request !1207
parents 4c21c172 9e67a55e
No related branches found
No related tags found
1 merge request!1207dnssec: fixes around timer Created:
Pipeline #71020 passed
......@@ -386,7 +386,10 @@ static roll_action_t next_action(kdnssec_ctx_t *ctx, zone_sign_roll_flags_t flag
case DNSSEC_KEY_STATE_ACTIVE:
if (!running_rollover(ctx) &&
dnssec_key_get_algorithm(key->key) == ctx->policy->algorithm) {
keytime = ksk_rollover_time(key->timing.created, ctx);
knot_time_t ksk_created = key->timing.created == 0 ?
key->timing.active :
key->timing.created;
keytime = ksk_rollover_time(ksk_created, ctx);
restype = GENERATE;
}
break;
......
......@@ -354,7 +354,7 @@ int keymgr_import_bind(kdnssec_ctx_t *ctx, const char *import_file, bool pub_onl
return KNOT_EINVAL;
}
knot_kasp_key_timing_t timing = { 0 };
knot_kasp_key_timing_t timing = { ctx->now, 0 };
dnssec_key_t *key = NULL;
char *keyid = NULL;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment