layer/iterate: cleanup

diff --git a/lib/layer/iterate.c b/lib/layer/iterate.c
index 4d6477ab67277577b687c15829029b732dcbc177..4ba353981031cdb66b5265a9e09da54661c69902 100644 (file)
--- 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 710fb066706f8cde483bc1b01cb4d19191a735ad..73ec3b7043f6c1aa5dc918d1e96d7e8e6a542de3 100644 (file)
--- 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 &&