From: Libor Peltan <libor.peltan@nic.cz>
Date: Wed, 20 Oct 2021 08:32:20 +0000 (+0200)
Subject: zone-update: remove useless flag
X-Git-Tag: v3.3.dev~302^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cd2f0eaceddb19b0a4fadeec104be79871ec9a9d;p=thirdparty%2Fknot-dns.git

zone-update: remove useless flag
---

diff --git a/src/knot/ctl/commands.c b/src/knot/ctl/commands.c
index 43be6d6e47..cb27333f09 100644
--- a/src/knot/ctl/commands.c
+++ b/src/knot/ctl/commands.c
@@ -661,7 +661,7 @@ static int zone_txn_begin(zone_t *zone, _unused_ ctl_args_t *args)
 	}
 
 	zone_update_flags_t type = (zone->contents == NULL) ? UPDATE_FULL : UPDATE_INCREMENTAL;
-	int ret = zone_update_init(zone->control_update, zone, type | UPDATE_SIGN | UPDATE_STRICT);
+	int ret = zone_update_init(zone->control_update, zone, type | UPDATE_STRICT);
 	if (ret != KNOT_EOK) {
 		free(zone->control_update);
 		zone->control_update = NULL;
@@ -693,7 +693,7 @@ static int zone_txn_commit(zone_t *zone, _unused_ ctl_args_t *args)
 
 	// Sign update.
 	conf_val_t val = conf_zone_get(conf(), C_DNSSEC_SIGNING, zone->name);
-	bool dnssec_enable = (zone->control_update->flags & UPDATE_SIGN) && conf_bool(&val);
+	bool dnssec_enable = conf_bool(&val);
 	if (dnssec_enable) {
 		zone_sign_reschedule_t resch = { 0 };
 		bool full = (zone->control_update->flags & UPDATE_FULL);
diff --git a/src/knot/events/handlers/update.c b/src/knot/events/handlers/update.c
index 6d10f32016..43e130060f 100644
--- a/src/knot/events/handlers/update.c
+++ b/src/knot/events/handlers/update.c
@@ -137,7 +137,7 @@ static int process_normal(conf_t *conf, zone_t *zone, list_t *requests)
 
 	// Init zone update structure
 	zone_update_t up;
-	int ret = zone_update_init(&up, zone, UPDATE_INCREMENTAL | UPDATE_SIGN);
+	int ret = zone_update_init(&up, zone, UPDATE_INCREMENTAL);
 	if (ret != KNOT_EOK) {
 		set_rcodes(requests, KNOT_RCODE_SERVFAIL);
 		return ret;
@@ -156,7 +156,7 @@ static int process_normal(conf_t *conf, zone_t *zone, list_t *requests)
 
 	// Sign update.
 	conf_val_t val = conf_zone_get(conf, C_DNSSEC_SIGNING, zone->name);
-	bool dnssec_enable = (up.flags & UPDATE_SIGN) && conf_bool(&val);
+	bool dnssec_enable = conf_bool(&val);
 	if (dnssec_enable) {
 		zone_sign_reschedule_t resch = { 0 };
 		ret = knot_dnssec_sign_update(&up, conf, &resch);
diff --git a/src/knot/updates/zone-update.h b/src/knot/updates/zone-update.h
index be5d0efc95..5edce40d66 100644
--- a/src/knot/updates/zone-update.h
+++ b/src/knot/updates/zone-update.h
@@ -53,7 +53,6 @@ typedef enum {
 	UPDATE_HYBRID         = 1 << 1, /*!< Changeset like for incremental, adjusting like full. */
 	UPDATE_INCREMENTAL    = 1 << 2, /*!< Apply changes to the old zone. */
 	// Additional flags
-	UPDATE_SIGN           = 1 << 3, /*!< Sign the resulting zone. */
 	UPDATE_STRICT         = 1 << 4, /*!< Apply changes strictly, i.e. fail when removing nonexistent RR. */
 	UPDATE_EXTRA_CHSET    = 1 << 6, /*!< Extra changeset in use, to store diff btwn zonefile and final contents. */
 	UPDATE_CHANGED_NSEC   = 1 << 7, /*!< This incremental update affects NSEC or NSEC3 nodes in zone. */