diff --git a/src/knot/updates/xfr-in.c b/src/knot/updates/xfr-in.c
index a5c3bb99ff336134a4e1f8cc415c2ebb57c39cac..2cf51552097c04991b8c27cccff74071c5df304c 100644
--- a/src/knot/updates/xfr-in.c
+++ b/src/knot/updates/xfr-in.c
@@ -1099,23 +1099,29 @@ int xfrin_apply_changesets_directly(zone_contents_t *contents,
const bool master = true; // Only DNSSEC changesets are applied directly.
int ret = xfrin_apply_changeset(contents, set, master);
if (ret != KNOT_EOK) {
+ xfrin_cleanup_successful_update(chsets);
return ret;
}
}
- return xfrin_finalize_updated_zone(contents, true);
+ int ret = xfrin_finalize_updated_zone(contents, true);
+
+ /*
+ * HACK: Cleanup for successful update is used for both success and fail
+ * when modifying the zone directly, will fix in new zone API.
+ */
+ xfrin_cleanup_successful_update(chsets);
+ return ret;
}
/*----------------------------------------------------------------------------*/
/* Post-DDNS application, no need to shallow copy. */
-int xfrin_apply_changesets_dnssec_ddns(zone_t *zone,
- zone_contents_t *z_new,
+int xfrin_apply_changesets_dnssec_ddns(zone_contents_t *z_new,
knot_changesets_t *sec_chsets,
knot_changesets_t *chsets)
{
- if (zone == NULL || z_new == NULL ||
- sec_chsets == NULL || chsets == NULL) {
+ if (z_new == NULL || sec_chsets == NULL || chsets == NULL) {
return KNOT_EINVAL;
}
@@ -1125,7 +1131,6 @@ int xfrin_apply_changesets_dnssec_ddns(zone_t *zone,
/* Apply changes. */
int ret = xfrin_apply_changesets_directly(z_new, sec_chsets);
if (ret != KNOT_EOK) {
- xfrin_rollback_update(sec_chsets, &z_new);
dbg_xfrin("Failed to apply changesets to zone: "
"%s\n", knot_strerror(ret));
return ret;
diff --git a/src/knot/zone/contents.c b/src/knot/zone/contents.c
index f7ffd9e502a8dd11a0a7a80b10d998c5cb0c2dd3..99a7b80905592dcbc30d7627c8a11200ecf0ad90 100644
--- a/src/knot/zone/contents.c
+++ b/src/knot/zone/contents.c
@@ -636,7 +636,7 @@ static zone_node_t *zone_contents_get_nsec3_node(const zone_contents_t *zone,
return n;
}
-static int insert_rr(knot_zone_contents_t *z,
+static int insert_rr(zone_contents_t *z,
const knot_rrset_t *rr, zone_node_t **n,
bool nsec3)
{
@@ -771,8 +771,8 @@ static bool rrset_is_nsec3rel(const knot_rrset_t *rr)
== KNOT_RRTYPE_NSEC3));
}
-int knot_zone_contents_add_rr(knot_zone_contents_t *z,
- const knot_rrset_t *rr, zone_node_t **n)
+int zone_contents_add_rr(zone_contents_t *z, const knot_rrset_t *rr,
+ zone_node_t **n)
{
return insert_rr(z, rr, n, rrset_is_nsec3rel(rr));
}
diff --git a/src/knot/zone/contents.h b/src/knot/zone/contents.h
index 240cfb271898d3cbef064e785ea4d69f0f0c6ab8..059c074f1dedb2efb774401e9bc789e6a336e913 100644
--- a/src/knot/zone/contents.h
+++ b/src/knot/zone/contents.h
@@ -91,8 +91,7 @@ int zone_contents_gen_is_new(const zone_contents_t *contents);
void zone_contents_set_gen_old(zone_contents_t *contents);
void zone_contents_set_gen_new(zone_contents_t *contents);
-int knot_zone_contents_add_rr(knot_zone_contents_t *z,
- const knot_rrset_t *rr, zone_node_t **n);
+int zone_contents_add_rr(zone_contents_t *z, const knot_rrset_t *rr, zone_node_t **n);
int zone_contents_remove_node(zone_contents_t *contents, const knot_dname_t *owner);
diff --git a/src/knot/zone/zone-load.c b/src/knot/zone/zone-load.c
index fe15852c3fd62c42b22dd92f49d065a8fa70c139..4e787cd21f4aae076dbaf239ac4da9dda98b0cd5 100644
--- a/src/knot/zone/zone-load.c
+++ b/src/knot/zone/zone-load.c
@@ -115,11 +115,6 @@ int zone_load_journal(zone_contents_t *contents, conf_zone_t *conf)
serial, zone_contents_serial(contents),
knot_strerror(ret));
- /* Free changesets and return. */
- if (ret == KNOT_EOK) {
- xfrin_cleanup_successful_update(chsets);
- }
-
knot_changesets_free(&chsets);
return ret;
}
diff --git a/src/knot/zone/zone.c b/src/knot/zone/zone.c
index e984b7ddaa2fcfa6febf5840cdc6a01eb65bdbfa..6df4a896af8acc85acf7dbd92ca8b7b4e39c3c76 100644
--- a/src/knot/zone/zone.c
+++ b/src/knot/zone/zone.c
@@ -158,18 +158,7 @@ int zone_change_commit(zone_contents_t *contents, knot_changesets_t *chset)
}
/* Apply DNSSEC changeset to the new zone. */
- int ret = xfrin_apply_changesets_directly(contents, chset);
- if (ret == KNOT_EOK) {
- ret = xfrin_finalize_updated_zone(contents, true);
- }
-
- if (ret == KNOT_EOK) {
- /* No need to do rollback, the whole new zone will be
- * discarded. */
- xfrin_cleanup_successful_update(chset);
- }
-
- return ret;
+ return xfrin_apply_changesets_directly(contents, chset);
}
int zone_change_store(zone_t *zone, knot_changesets_t *chset)
@@ -207,7 +196,6 @@ int zone_change_apply_and_store(knot_changesets_t *chs,
ret = xfrin_apply_changesets(zone, chs, new_contents);
if (ret != KNOT_EOK) {
log_zone_error("%s Failed to apply changesets.\n", msgpref);
-
/* Free changesets, but not the data. */
knot_changesets_free(&chs);
return ret; // propagate the error above
@@ -217,7 +205,7 @@ int zone_change_apply_and_store(knot_changesets_t *chs,
ret = zone_change_store(zone, chs);
if (ret != KNOT_EOK) {
log_zone_error("%s Failed to store changesets.\n", msgpref);
-
+ xfrin_rollback_update(chs, new_contents);
/* Free changesets, but not the data. */
knot_changesets_free(&chs);
return ret; // propagate the error above
diff --git a/src/knot/zone/zonefile.c b/src/knot/zone/zonefile.c
index 5a9f211cf491f157c765867da5aab1e3dbe40713..f6413ffb7556d2af01ad9179c1c56484bbb08008 100644
--- a/src/knot/zone/zonefile.c
+++ b/src/knot/zone/zonefile.c
@@ -37,7 +37,7 @@
#include "libknot/rdata.h"
#include "knot/zone/zone-dump.h"
-void process_error(const zs_scanner_t *s)
+void process_error(zs_scanner_t *s)
{
if (s->stop == true) {
log_zone_error("Fatal error in zone file %s:%"PRIu64": %s "
@@ -116,7 +116,7 @@ int zcreator_step(zcreator_t *zc, const knot_rrset_t *rr)
}
zone_node_t *node = NULL;
- int ret = knot_zone_contents_add_rr(zc->z, rr, &node);
+ int ret = zone_contents_add_rr(zc->z, rr, &node);
if (ret != KNOT_EOK) {
if (!handle_err(zc, node, rr, ret, zc->master)) {
// Fatal error
@@ -145,7 +145,7 @@ int zcreator_step(zcreator_t *zc, const knot_rrset_t *rr)
}
/*! \brief Creates RR from parser input, passes it to handling function. */
-static void loader_process(const zs_scanner_t *scanner)
+static void loader_process(zs_scanner_t *scanner)
{
zcreator_t *zc = scanner->data;
if (zc->ret != KNOT_EOK) {
diff --git a/src/zscanner/scanner.rl b/src/zscanner/scanner.rl
index 653848aba40666cd5ced82ffac31de91e7651976..756e1e774679270d857594d9ba46bb6091ddfdb4 100644
--- a/src/zscanner/scanner.rl
+++ b/src/zscanner/scanner.rl
@@ -41,7 +41,7 @@
/*!
* \brief Empty function which is called if no callback function is specified.
*/
-static inline void noop(zs_scanner_t *s)
+static inline void noop(const zs_scanner_t *s)
{
(void)s;
}