From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Tue, 28 May 2019 12:17:19 +0000 (+0200)
Subject: Remove disable-tcp option
X-Git-Tag: dnsdist-1.4.0-beta1~10^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=998fddc30f3037692a339de1845994602f12af18;p=thirdparty%2Fpdns.git

Remove disable-tcp option
---

diff --git a/docs/settings.rst b/docs/settings.rst
index 349d4e5f6a..50fa520f03 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -508,6 +508,9 @@ inside a supervisor that handles logging (like systemd).
 -  Boolean
 -  Default: no
 
+.. versionchanged:: 4.2.0
+  This setting has been removed
+
 Do not listen to TCP queries. Breaks RFC compliance.
 
 .. _setting-distributor-threads:
diff --git a/pdns/common_startup.cc b/pdns/common_startup.cc
index bd57fc5423..b4334b9f26 100644
--- a/pdns/common_startup.cc
+++ b/pdns/common_startup.cc
@@ -117,7 +117,6 @@ void declareArguments()
   ::arg().set("queue-limit","Maximum number of milliseconds to queue a query")="1500"; 
   ::arg().set("resolver","Use this resolver for ALIAS and the internal stub resolver")="no";
   ::arg().set("udp-truncation-threshold", "Maximum UDP response size before we truncate")="1232";
-  ::arg().set("disable-tcp","Do not listen to TCP queries")="no";
   
   ::arg().set("config-name","Name of this virtual configuration - will rename the binary image")="";
 
diff --git a/pdns/receiver.cc b/pdns/receiver.cc
index 0c86d515be..dfe609c356 100644
--- a/pdns/receiver.cc
+++ b/pdns/receiver.cc
@@ -590,8 +590,7 @@ int main(int argc, char **argv)
       }
     }
 
-    if(!::arg().mustDo("disable-tcp"))
-      TN=new TCPNameserver; 
+    TN = new TCPNameserver;
   }
   catch(const ArgException &A) {
     g_log<<Logger::Error<<"Fatal error: "<<A.reason<<endl;