From: Daniel Salzman <daniel.salzman@nic.cz>
Date: Wed, 6 Feb 2019 12:31:11 +0000 (+0100)
Subject: adjusting: use zone_contents_find_node_or_wildcard for additionals discovery
X-Git-Tag: v2.8.0~72^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=50d0e773dfd3be0df45a992a947f0390e21053d3;p=thirdparty%2Fknot-dns.git

adjusting: use zone_contents_find_node_or_wildcard for additionals discovery
---

diff --git a/src/knot/zone/adjust.c b/src/knot/zone/adjust.c
index 6d9f4c7251..d6afafc2df 100644
--- a/src/knot/zone/adjust.c
+++ b/src/knot/zone/adjust.c
@@ -135,18 +135,9 @@ static int discover_additionals(const knot_dname_t *owner, struct rr_data *rr_da
 	for (uint16_t i = 0; i < rdcount; i++) {
 		knot_rdata_t *rdata = knot_rdataset_at(rrs, i);
 		const knot_dname_t *dname = knot_rdata_name(rdata, rr_data->type);
-		const zone_node_t *node = NULL, *encloser = NULL;
-
-		/* Try to find node for the dname in the RDATA. */
-		zone_contents_find_dname(zone, dname, &node, &encloser, NULL);
-		if (node == NULL && encloser != NULL
-		    && (encloser->flags & NODE_FLAGS_WILDCARD_CHILD)) {
-			/* Find wildcard child in the zone. */
-			node = zone_contents_find_wildcard_child(zone, encloser);
-			assert(node != NULL);
-		}
+		const zone_node_t *node = NULL;
 
-		if (node == NULL) {
+		if (!zone_contents_find_node_or_wildcard(zone, dname, &node)) {
 			continue;
 		}