From: Grigorii Demidov <grigorii.demidov@nic.cz>
Date: Tue, 16 May 2017 10:42:11 +0000 (+0200)
Subject: layer/iterate: cleanup
X-Git-Tag: 1.3.0-rc1~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=77c10a4800b984da3ada2d1a1284f3965450a4e2;p=thirdparty%2Fknot-resolver.git

layer/iterate: cleanup
---

diff --git a/lib/layer/iterate.c b/lib/layer/iterate.c
index 4d6477ab6..4ba353981 100644
--- a/lib/layer/iterate.c
+++ b/lib/layer/iterate.c
@@ -360,20 +360,12 @@ static int process_authority(knot_pkt_t *pkt, struct kr_request *req)
 	assert(!(qry->flags & QUERY_STUB));
 
 	int result = KR_STATE_CONSUME;
-	const knot_pktsection_t *ns = knot_pkt_section(pkt, KNOT_AUTHORITY);
-
 	if (qry->flags & QUERY_FORWARD) {
-		for (unsigned i = 0; i < ns->count; ++i) {
-			const knot_rrset_t *rr = knot_pkt_rr(ns, i);
-			if (rr->type == KNOT_RRTYPE_SOA || rr->type == KNOT_RRTYPE_NS) {
-				if (knot_dname_in(rr->owner, knot_pkt_qname(pkt))) {
-					qry->zone_cut.name = knot_dname_copy(rr->owner, &req->pool);
-				}
-			}
-		}
-		return KR_STATE_CONSUME;
+		return result;
 	}
 
+	const knot_pktsection_t *ns = knot_pkt_section(pkt, KNOT_AUTHORITY);
+
 #ifdef STRICT_MODE
 	/* AA, terminate resolution chain. */
 	if (knot_wire_get_aa(pkt->wire)) {
diff --git a/lib/layer/validate.c b/lib/layer/validate.c
index 710fb0667..73ec3b704 100644
--- a/lib/layer/validate.c
+++ b/lib/layer/validate.c
@@ -888,10 +888,6 @@ static int validate(kr_layer_t *ctx, knot_pkt_t *pkt)
 
 
 	if (qry->flags & QUERY_FORWARD) {
-		if (qry->parent &&
-		    qtype == KNOT_RRTYPE_NS) {
-			printf("NS NODATA\n");
-		}
 		if (qry->parent &&
 		    qtype == KNOT_RRTYPE_NS &&
 		    !no_data &&