Revert "adjusting incremental updates: direct nsec3 pointers only for changed nodes"

This reverts commit 48af77ab9ffa6425242abfcdad667fbd8c8779c8.

diff --git a/src/knot/updates/zone-update.c b/src/knot/updates/zone-update.c
index aae248974839ca0b27279db22c03774a97aa61cf..4ebd4b55d03a1e00e4d0a151cd5bdb6aec60c08f 100644 (file)
--- a/src/knot/updates/zone-update.c
+++ b/src/knot/updates/zone-update.c
@@ -613,13 +613,7 @@ static int commit_incremental(conf_t *conf, zone_update_t *update)
                }
        }
 
-       ret = zone_adjust_contents(new_contents, adjust_cb_flags, adjust_cb_nsec3_flags, true);
-       if (ret == KNOT_EOK) {
-               ret = zone_adjust_update(update, adjust_cb_point_to_nsec3, NULL);
-       }
-       if (ret == KNOT_EOK) {
-               ret = zone_adjust_contents(new_contents, adjust_cb_nsec3wc_and_additionals, NULL, false);
-       }
+       ret = zone_adjust_full(new_contents);
        if (ret != KNOT_EOK) {
                zone_update_clear(update);
                return ret;

diff --git a/src/knot/zone/adjust.c b/src/knot/zone/adjust.c
index c4871518746de84f37c6abb23aae60c1f6eab8e5..27ac4863032560e51b6d2bc7933d51737dc76998 100644 (file)
--- a/src/knot/zone/adjust.c
+++ b/src/knot/zone/adjust.c
@@ -234,15 +234,6 @@ int adjust_cb_nsec3_and_additionals(zone_node_t *node, const zone_contents_t *zo
        return ret;
 }
 
-int adjust_cb_nsec3wc_and_additionals(zone_node_t *node, const zone_contents_t *zone)
-{
-       int ret = adjust_cb_wildcard_nsec3(node, zone);
-       if (ret == KNOT_EOK) {
-               ret = adjust_cb_additionals(node, zone);
-       }
-       return ret;
-}
-
 int adjust_cb_void(zone_node_t *node, const zone_contents_t *zone)
 {
        UNUSED(node);

diff --git a/src/knot/zone/adjust.h b/src/knot/zone/adjust.h
index 56ecc87d0843e1ead069b663b3c99cfc8682fedf..18e7af1b115830f897dee6f2ffc96fa8ffa19841 100644 (file)
--- a/src/knot/zone/adjust.h
+++ b/src/knot/zone/adjust.h
@@ -54,9 +54,6 @@ int adjust_cb_flags_and_nsec3(zone_node_t *node, const zone_contents_t *zone);
 // adjust_cb_point_to_nsec3, adjust_cb_wildcard_nsec3 and adjust_cb_additionals at once
 int adjust_cb_nsec3_and_additionals(zone_node_t *node, const zone_contents_t *zone);
 
-// adjust_cb_wildcard_nsec3 and adjust_cb_additionals at once
-int adjust_cb_nsec3wc_and_additionals(zone_node_t *node, const zone_contents_t *zone);
-
 // dummy callback, just make prev pointers adjusting and zone size measuring work
 int adjust_cb_void(zone_node_t *node, const zone_contents_t *zone);