From 1975645315939ece0c2976892172c4909c108e11 Mon Sep 17 00:00:00 2001
From: Jan Kadlec <jan.kadlec@nic.cz>
Date: Mon, 16 Sep 2013 10:54:02 +0200
Subject: [PATCH] DNSSEC: removed redundant rollback calls.
---
src/knot/server/zones.c | 13 +------------
src/libknot/updates/xfr-in.c | 1 -
2 files changed, 1 insertion(+), 13 deletions(-)
diff --git a/src/knot/server/zones.c b/src/knot/server/zones.c
index 0785a84120..1670739cab 100644
--- a/src/knot/server/zones.c
+++ b/src/knot/server/zones.c
@@ -1024,11 +1024,6 @@ static int zones_journal_apply(knot_zone_t *zone)
zd->conf->name,
knot_strerror(apply_ret));
ret = KNOT_ERROR;
-
- // Cleanup old and new contents
- xfrin_rollback_update(zone->contents,
- &contents,
- chsets->changes);
} else {
/* Switch zone immediately. */
log_server_info("Zone '%s' serial %u -> %u.\n",
@@ -1049,11 +1044,6 @@ static int zones_journal_apply(knot_zone_t *zone)
"%s\n", zd->conf->name,
knot_strerror(apply_ret));
ret = KNOT_ERROR;
-
- // Cleanup old and new contents
- xfrin_rollback_update(zone->contents,
- &contents,
- chsets->changes);
}
}
}
@@ -1419,8 +1409,7 @@ static int zones_insert_zone(conf_zone_t *z, knot_zone_t **dst,
rcu_read_unlock();
return KNOT_ENOMEM;
}
- int ret = zones_create_changeset(z_old,
- zone, diff_ch);
+ int ret = zones_create_changeset(z_old, zone, diff_ch);
if (ret == KNOT_ENODIFF) {
log_zone_warning("Zone file for "
"'%s' changed, "
diff --git a/src/libknot/updates/xfr-in.c b/src/libknot/updates/xfr-in.c
index 99afa96fa1..d06937b1ee 100644
--- a/src/libknot/updates/xfr-in.c
+++ b/src/libknot/updates/xfr-in.c
@@ -2579,7 +2579,6 @@ static int xfrin_apply_changeset(knot_zone_contents_t *contents,
if (soa == NULL || knot_rrset_rdata_soa_serial(soa)
!= chset->serial_from) {
dbg_xfrin("SOA serials do not match!!\n");
- assert(0);
return KNOT_ERROR;
}
--
GitLab