From: Karel Slany <karel.slany@nic.cz>
Date: Wed, 13 Jul 2016 09:46:25 +0000 (+0200)
Subject: Removed conditional compilation around QUERY_BADCOOKIE_AGAIN handling.
X-Git-Tag: v1.1.0~2^2~60
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f4d3b3d01f0f21164c6fa8a896b27f11a6ed8a2a;p=thirdparty%2Fknot-resolver.git

Removed conditional compilation around QUERY_BADCOOKIE_AGAIN handling.
---

diff --git a/lib/layer/iterate.c b/lib/layer/iterate.c
index 8b10dcf32..f963596d0 100644
--- 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 4ad0aaedb..51c068644 100644
--- 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);