]> git.ipfire.org Git - thirdparty/knot-resolver.git/commitdiff
iterate.c: remove STRICT_MODE for good 76175
authorŠtěpán Balážik <stepan.balazik@nic.cz>
Thu, 4 Feb 2021 15:58:51 +0000 (16:58 +0100)
committerŠtěpán Balážik <stepan.balazik@nic.cz>
Fri, 5 Feb 2021 09:46:15 +0000 (10:46 +0100)
Removing this workaround actually causes Deckard scenarios to fail
(namely iter_escape_bailiwick.rpl) so I conclude that it is needed.

lib/layer/iterate.c

index 8ea7b7f4c064d8ed18b4f3fdbab3ce5455ed93a0..0a09a9006ceff3174ba65ad2f91a43172aef6a33 100644 (file)
@@ -254,16 +254,12 @@ static int update_cut(knot_pkt_t *pkt, const knot_rrset_t *rr,
        if (!ok) {
                VERBOSE_MSG("<= authority: ns outside bailiwick\n");
                qry->server_selection.error(qry, req->upstream.transport, KR_SELECTION_LAME_DELEGATION);
-#ifdef STRICT_MODE
-               return KR_STATE_FAIL;
-#else
                /* Workaround: ignore out-of-bailiwick NSs for authoritative answers,
                 * but fail for referrals. This is important to detect lame answers. */
                if (knot_pkt_section(pkt, KNOT_ANSWER)->count == 0) {
                        state = KR_STATE_FAIL;
                }
                return state;
-#endif
        }
 
        /* Update zone cut name */