From: Vladimír Čunát <vladimir.cunat@nic.cz>
Date: Wed, 17 May 2017 17:58:13 +0000 (+0200)
Subject: resolve: remove an incorrectly added condition
X-Git-Tag: 1.3.0-rc1~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f80c506d3eebff87fe22005e9a4b2e0afe6f3daa;p=thirdparty%2Fknot-resolver.git

resolve: remove an incorrectly added condition

This part of code is NOT reachable when forwarding, because
ns.name is . (the root) and retry is true.
kr_nsrep_elect* would ruin forwarding anyway, as they're written ATM.
---

diff --git a/lib/resolve.c b/lib/resolve.c
index 1a659781a..32d06161f 100644
--- a/lib/resolve.c
+++ b/lib/resolve.c
@@ -1330,8 +1330,7 @@ ns_election:
 		kr_nsrep_elect_addr(qry, request->ctx);
 	} else if (!qry->ns.name || !retry) { /* Keep NS when requerying/stub/badcookie. */
 		/* Root DNSKEY must be fetched from the hints to avoid chicken and egg problem. */
-		if (qry->sname[0] == '\0' && qry->stype == KNOT_RRTYPE_DNSKEY
-		    && !(qry->stype | QUERY_FORWARD)) {
+		if (qry->sname[0] == '\0' && qry->stype == KNOT_RRTYPE_DNSKEY) {
 			kr_zonecut_set_sbelt(request->ctx, &qry->zone_cut);
 			qry->flags |= QUERY_NO_THROTTLE; /* Pick even bad SBELT servers */
 		}