Commit 7f46eb40 authored by Libor Peltan's avatar Libor Peltan

journal: fixed TTL mismatch when merging changesets with different DNSKEY TTL

parent 8fa2ab19
......@@ -315,7 +315,9 @@ int changeset_add_removal(changeset_t *ch, const knot_rrset_t *rrset, unsigned f
knot_rrset_free((knot_rrset_t **)&rrset, NULL);
}
return ret;
// we don't care of TTLs at removals anyway (updates/apply.c/can_remove()/compare_ttls)
// in practice, this happens at merging changesets
return (ret == KNOT_ETTL ? KNOT_EOK : ret);
}
int changeset_remove_addition(changeset_t *ch, const knot_rrset_t *rrset)
......
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