From 998fddc30f3037692a339de1845994602f12af18 Mon Sep 17 00:00:00 2001 From: Pieter Lexis Date: Tue, 28 May 2019 14:17:19 +0200 Subject: [PATCH] Remove disable-tcp option --- docs/settings.rst | 3 +++ pdns/common_startup.cc | 1 - pdns/receiver.cc | 3 +-- 3 files changed, 4 insertions(+), 3 deletions(-) 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<