Commit c8788d67 authored by Libor Peltan's avatar Libor Peltan

zone load: put re-sign into journal even for reload

parent a42c11df
......@@ -115,7 +115,8 @@ int event_load(conf_t *conf, zone_t *zone)
ret = KNOT_EOK;
goto cleanup;
} else if (zf_from == ZONEFILE_LOAD_WHOLE) {
ret = zone_update_from_contents(&up, zone, zf_conts, UPDATE_FULL);
ret = zone_update_from_contents(&up, zone, zf_conts,
(load_from == JOURNAL_CONTENT_NONE ? UPDATE_FULL : UPDATE_INCREMENTAL));
} else {
ret = zone_update_from_differences(&up, zone, zone->contents, zf_conts, UPDATE_INCREMENTAL);
}
......
......@@ -561,7 +561,7 @@ static int commit_incremental(conf_t *conf, zone_update_t *update,
if (changeset_empty(&update->change)) {
changeset_clear(&update->change);
if (update->zone->contents == NULL) {
if (update->zone->contents == NULL || update->new_cont_deep_copy) {
*contents_out = update->new_cont;
}
return KNOT_EOK;
......
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