From: Daniel Salzman <daniel.salzman@nic.cz>
Date: Tue, 30 Jul 2019 21:39:22 +0000 (+0200)
Subject: node: check binode-related flags if a binode
X-Git-Tag: v2.9.0~173
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=856e28fc828ebbcbf6caf92db90d6af6f98ef4f9;p=thirdparty%2Fknot-dns.git

node: check binode-related flags if a binode
---

diff --git a/src/knot/zone/contents.c b/src/knot/zone/contents.c
index f5ea384b05..0d3d975369 100644
--- a/src/knot/zone/contents.c
+++ b/src/knot/zone/contents.c
@@ -89,7 +89,6 @@ static bool find_in_tree(zone_tree_t *tree, const knot_dname_t *name,
 static zone_node_t *node_new_for_contents(const knot_dname_t *owner, const zone_contents_t *contents)
 {
 	return node_new(owner, (contents->nodes->flags & ZONE_TREE_USE_BINODES),
-	                (contents->nodes->flags & ZONE_TREE_USE_BINODES) &&
 	                (contents->nodes->flags & ZONE_TREE_BINO_SECOND), NULL);
 }
 
diff --git a/src/knot/zone/node.c b/src/knot/zone/node.c
index c88cd7b161..35673559e4 100644
--- a/src/knot/zone/node.c
+++ b/src/knot/zone/node.c
@@ -117,12 +117,12 @@ zone_node_t *node_new(const knot_dname_t *owner, bool binode, bool second, knot_
 
 	// Node is authoritative by default.
 	ret->flags = NODE_FLAGS_AUTH;
-	if (second) {
-		ret->flags |= NODE_FLAGS_DELETED;
-	}
 
 	if (binode) {
 		ret->flags |= NODE_FLAGS_BINODE;
+		if (second) {
+			ret->flags |= NODE_FLAGS_DELETED;
+		}
 		memcpy(ret + 1, ret, sizeof(*ret));
 		(ret + 1)->flags ^= NODE_FLAGS_SECOND | NODE_FLAGS_DELETED;
 	}