From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Thu, 1 Jul 2021 20:36:50 +0000 (+0200)
Subject: remove DNS_OVER_TLS guard around applying the dot-to-port-853 setting
X-Git-Tag: dnsdist-1.7.0-alpha1~108^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a05df8bd4212eb3117edd4e74b6ee511d11d0501;p=thirdparty%2Fpdns.git

remove DNS_OVER_TLS guard around applying the dot-to-port-853 setting

before this commit: pointing a forward at port 853, without DoT support, causes Recursor to attempt to do UDP over port 853 to the upstream. This rarely works.

after this commit: much swifter failure with an error log message saying `45.55.10.200:853 requested but not available`
---

diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index 8ec44fff7e..b08d5d9342 100644
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -4883,9 +4883,7 @@ static int serviceMain(int argc, char*argv[])
   SyncRes::s_tcp_fast_open = ::arg().asNum("tcp-fast-open");
   SyncRes::s_tcp_fast_open_connect = ::arg().mustDo("tcp-fast-open-connect");
 
-#ifdef HAVE_DNS_OVER_TLS
   SyncRes::s_dot_to_port_853 = ::arg().mustDo("dot-to-port-853");
-#endif
 
   if (SyncRes::s_tcp_fast_open_connect) {
     checkFastOpenSysctl(true);