From: Vladimír Čunát <vladimir.cunat@nic.cz>
Date: Wed, 20 Aug 2025 07:11:38 +0000 (+0200)
Subject: lib/selection: respect 0x20 settings even after TCP issues
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fenvironments%2Fdocs-0x20-reset-fm5bf0%2Fdeployments%2F7583;p=thirdparty%2Fknot-resolver.git

lib/selection: respect 0x20 settings even after TCP issues

Thankfully we can pull it from kr_request,
as policy.FLAGS() also sets it in there.
---

diff --git a/NEWS b/NEWS
index ae95ca416..6246e7abf 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,10 @@ Improvements
 ------------
 - reduce validation strictness for domain names (#934, !1727)
 
+Bugfixes
+--------
+- /options/query-case-randomization: respect this even on TCP issues (!1732)
+
 
 Knot Resolver 6.0.15 (2025-07-17)
 =================================
diff --git a/lib/selection.c b/lib/selection.c
index 6ba549cd3..ed8ac5a21 100644
--- a/lib/selection.c
+++ b/lib/selection.c
@@ -648,7 +648,7 @@ void error(struct kr_query *qry, struct address_state *addr_state,
 	case KR_SELECTION_TCP_CONNECT_FAILED:
 	case KR_SELECTION_TCP_CONNECT_TIMEOUT:
 		qry->server_selection.local_state->force_udp = true;
-		qry->flags.NO_0X20 = false;
+		qry->flags.NO_0X20 = qry->request->options.NO_0X20;
 		/* Connection and handshake failures have properties similar
 		 * to UDP timeouts, so we handle them (almost) the same way. */
 		/* fall-through */