Removed conditional compilation around QUERY_BADCOOKIE_AGAIN handling.

diff --git a/lib/layer/iterate.c b/lib/layer/iterate.c
index 8b10dcf32253cd1b704660ac50d04965674bbd6f..f963596d07520de29201557562f6a6311fcc6c6b 100644 (file)
--- a/lib/layer/iterate.c
+++ b/lib/layer/iterate.c
@@ -576,11 +576,7 @@ static int resolve(knot_layer_t *ctx, knot_pkt_t *pkt)
        assert(pkt && ctx);
        struct kr_request *req = ctx->data;
        struct kr_query *query = req->current_query;
-#if defined(ENABLE_COOKIES)
        if (!query || (query->flags & (QUERY_RESOLVED|QUERY_BADCOOKIE_AGAIN))) {
-#else /* !defined(ENABLE_COOKIES) */
-       if (!query || (query->flags & QUERY_RESOLVED)) {
-#endif /* defined(ENABLE_COOKIES) */
                return ctx->state;
        }
 

diff --git a/lib/resolve.c b/lib/resolve.c
index 4ad0aaedbbd828a2b139850140d74afebcbb43db..51c0686441f27fe8736c17b3b7fc94db778c4af2 100644 (file)
--- a/lib/resolve.c
+++ b/lib/resolve.c
@@ -837,11 +837,7 @@ ns_election:
 
        if (qry->flags & (QUERY_AWAIT_IPV4|QUERY_AWAIT_IPV6)) {
                kr_nsrep_elect_addr(qry, request->ctx);
-#if defined(ENABLE_COOKIES)
        } else if (!qry->ns.name || !(qry->flags & (QUERY_TCP|QUERY_STUB|QUERY_BADCOOKIE_AGAIN))) { /* Keep NS when requerying/stub/badcookie. */
-#else /* !defined(ENABLE_COOKIES) */
-       } else if (!qry->ns.name || !(qry->flags & (QUERY_TCP|QUERY_STUB))) { /* Keep NS when requerying/stub. */
-#endif /* defined(ENABLE_COOKIES) */
                /* Root DNSKEY must be fetched from the hints to avoid chicken and egg problem. */
                if (qry->sname[0] == '\0' && qry->stype == KNOT_RRTYPE_DNSKEY) {
                        kr_zonecut_set_sbelt(request->ctx, &qry->zone_cut);