]> git.ipfire.org Git - thirdparty/knot-resolver.git/commitdiff
resolve: remove an incorrectly added condition
authorVladimír Čunát <vladimir.cunat@nic.cz>
Wed, 17 May 2017 17:58:13 +0000 (19:58 +0200)
committerVladimír Čunát <vladimir.cunat@nic.cz>
Thu, 1 Jun 2017 14:27:16 +0000 (16:27 +0200)
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.

lib/resolve.c

index 1a659781a307969a48b63eb48c6a645f63a78d44..32d06161fcfdae817c357e0205672d37098064bc 100644 (file)
@@ -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 */
                }