Commit 097c227f authored by Libor Peltan's avatar Libor Peltan Committed by Daniel Salzman

ksk rollover: fixed replanning rollover events

parent 88490e2d
......@@ -363,6 +363,7 @@ static int zone_ksk_submittion_confirm(zone_t *zone, ctl_args_t *args)
kdnssec_ctx_deinit(&ctx);
// zone_events_schedule_now(zone, ZONE_EVENT_KEY_ROLLOVER); // TODO needed ?
zone_events_schedule_now(zone, ZONE_EVENT_DNSSEC);
// NOT zone_events_schedule_user(), intentionally
......
......@@ -80,6 +80,8 @@ static int generate_key(kdnssec_ctx_t *ctx, bool ksk, time_t when_active)
return r;
}
key->timing.remove = TIME_INFINITY;
key->timing.retire = TIME_INFINITY;
key->timing.active = when_active;
key->timing.ready = when_active;
key->timing.publish = ctx->now;
......@@ -108,6 +110,8 @@ static int share_or_generate_key(kdnssec_ctx_t *ctx, bool ksk, time_t when_activ
if (ret != KNOT_EOK) {
return ret;
}
key->timing.remove = TIME_INFINITY;
key->timing.retire = TIME_INFINITY;
key->timing.active = when_active;
key->timing.ready = when_active;
key->timing.publish = ctx->now;
......
......@@ -215,7 +215,8 @@ int event_parent_ds_q(conf_t *conf, zone_t *zone)
time_t next_check = time(NULL) + conf_int(&check_interval);
zone_events_schedule_at(zone, ZONE_EVENT_PARENT_DS_Q, next_check);
} else {
zone_events_schedule_now(zone, ZONE_EVENT_DNSSEC);
zone_events_schedule_now(zone, ZONE_EVENT_KEY_ROLLOVER);
zone_events_schedule_now(zone, ZONE_EVENT_DNSSEC); // TODO needed ?
}
free_zone_keys(&keyset);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment