Commit 5c62dc0d authored by Daniel Salzman's avatar Daniel Salzman

zone-update: don't abort control transaction by itself

fix of "zone: invalidate possible control transaction during zone commit"
parent 21cf6e22
......@@ -750,7 +750,8 @@ int zone_update_commit(conf_t *conf, zone_update_t *update)
}
/* Abort control transaction if any. */
if (update->zone->control_update != NULL) {
if (update->zone->control_update != NULL &&
update->zone->control_update != update) {
log_zone_warning(update->zone->name, "control transaction aborted");
zone_control_clear(update->zone);
}
......
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