Remove disable-tcp option

diff --git a/docs/settings.rst b/docs/settings.rst
index 349d4e5f6aab71f24de823dce3ad1b1e76a151c4..50fa520f03511a54d9ae1aaa6932dbccea86382f 100644 (file)
--- 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 bd57fc54235208771682b01da17d0c3a1d5e146d..b4334b9f26f29543a70ce39ee219ed33f2a482fc 100644 (file)
--- 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 0c86d515be4f71bf91fbc585f516894e73071e85..dfe609c356a93936795c211e283df9d45d1c5873 100644 (file)
--- 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;