From 21011baf45986d44e03772791e5b69a8717a1360 Mon Sep 17 00:00:00 2001
From: Daniel Salzman <daniel.salzman@nic.cz>
Date: Mon, 15 Feb 2021 17:31:53 +0100
Subject: [PATCH] fixup! catalog: implement member transfer btwn catalogs,
refactoring
---
src/knot/zone/catalog.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/knot/zone/catalog.c b/src/knot/zone/catalog.c
index 498e752504..b31e6f788c 100644
--- a/src/knot/zone/catalog.c
+++ b/src/knot/zone/catalog.c
@@ -551,6 +551,8 @@ static bool upd_cancel_out(catalog_upd_val_t **p_orig, const knot_dname_t *new_o
int new_bail, catalog_upd_type_t new_type)
{
catalog_upd_val_t *orig = *p_orig;
+ assert(orig->type == MEMB_UPD_ADD || orig->type == MEMB_UPD_REM);
+
if (knot_dname_is_equal(orig->owner, new_owner) &&
orig->catzone - orig->owner == new_bail &&
orig->type != new_type) {
@@ -1000,7 +1002,7 @@ int catalog_update_commit(catalog_update_t *u, catalog_t *cat)
if (ret == KNOT_EOK) {
ret = catalog_commit(cat);
}
- return KNOT_EOK;
+ return ret;
}
static void print_dname(const knot_dname_t *d)
--
GitLab