From: Marek Vavruša <marek.vavrusa@nic.cz>
Date: Wed, 24 Jun 2015 19:22:54 +0000 (+0200)
Subject: layer/iterate: do not check 0x20 if safemode or cached
X-Git-Tag: v1.0.0-beta1~107^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d0765e5a409404db64da66f53813ce91c7a97ea1;p=thirdparty%2Fknot-resolver.git

layer/iterate: do not check 0x20 if safemode or cached
---

diff --git a/lib/layer/iterate.c b/lib/layer/iterate.c
index 865ded6c1..d7cdb289c 100644
--- a/lib/layer/iterate.c
+++ b/lib/layer/iterate.c
@@ -87,7 +87,7 @@ static bool is_paired_to_query(const knot_pkt_t *answer, struct kr_query *query)
 	/* Construct expected randomized QNAME */
 	uint8_t qname[KNOT_DNAME_MAXLEN];
 	knot_dname_to_wire(qname, qname_min, sizeof(qname));
-	if (!(query->flags & QUERY_CACHED)) {
+	if (!(query->flags & (QUERY_CACHED|QUERY_SAFEMODE))) {
 		randomized_qname_case(qname, query->secret);
 	}
 
diff --git a/modules/block/block.lua b/modules/block/block.lua
index 348471e3b..776f25364 100644
--- a/modules/block/block.lua
+++ b/modules/block/block.lua
@@ -108,7 +108,7 @@ block.layer = {
 			-- Answer full question
 			local qclass = kres.query_qclass(qry)
 			local qtype = kres.query_qtype(qry)
-			kres.query_flag(qry, kres.query.NO_MINIMIZE)
+			kres.query_flag(qry, kres.query.NO_MINIMIZE + kres.query.SAFEMODE)
 			pkt:question(qname, qclass, qtype)
 			pkt:flag(kres.wire.QR)
 			pkt:flag(kres.wire.AA)