From: Grigorii Demidov <grigorii.demidov@nic.cz>
Date: Fri, 23 Dec 2016 08:28:29 +0000 (+0100)
Subject: layer/iterate: use 'old' bechavior in STRICT mode when updating cut
X-Git-Tag: v1.2.0-rc1~41^2~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aea4ff5512ad78550d69964e9682899f3fefb821;p=thirdparty%2Fknot-resolver.git

layer/iterate: use 'old' bechavior in STRICT mode when updating cut
---

diff --git a/lib/layer/iterate.c b/lib/layer/iterate.c
index 4b44b4939..ef2536e11 100644
--- a/lib/layer/iterate.c
+++ b/lib/layer/iterate.c
@@ -243,13 +243,7 @@ static int update_cut(knot_pkt_t *pkt, const knot_rrset_t *rr,
 		/* Choose when to use glue records. */
 		if (qry->flags & QUERY_PERMISSIVE) {
 			fetch_glue(pkt, ns_name, req);
-		} else if ((qry->flags & (QUERY_STRICT | QUERY_DNSSEC_WANT)) ==
-			   QUERY_STRICT) {
-			/* Strict mode uses only mandatory glue for unsecure query.
-			 * If secure, we'll got circular dependency ->
-			 * we need to fetch DNSKEY,
-			 * so we need to fetch glue from authoritative ns,
-			 * but we can't validate glue due to DNSKEY absense */
+		} else if (qry->flags & QUERY_STRICT) {
 			if (knot_dname_in(cut->name, ns_name))
 				fetch_glue(pkt, ns_name, req);
 		} else {