Remove last remnants of disable-edns

diff --git a/docs/markdown/recursor/settings.md b/docs/markdown/recursor/settings.md
index 9a2ea4f64349d09165ec4a841697e3855c859485..e06e8fe72ed1c518789c0327203f5b9fd80b7231 100644 (file)
--- a/docs/markdown/recursor/settings.md
+++ b/docs/markdown/recursor/settings.md
@@ -151,12 +151,6 @@ Operate in the background.
 
 Which domains we only accept delegations from (a Verisign special).
 
-## `disable-edns`
-* Boolean
-* Default: yes
-
-Disable EDNS. EDNS support is experimental, please keep this setting as-is.
-
 ## `disable-packetcache`
 * Boolean
 * Default: no

diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index 7dab9f0a86a4f474e1d79ae2303ec1ac53a094e2..52a55c46406bf64f187e5c6221c7732c3afe5938 100644 (file)
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -2587,8 +2587,6 @@ int main(int argc, char **argv)
     ::arg().set("serve-rfc1918", "If we should be authoritative for RFC 1918 private IP space")="";
     ::arg().set("lua-dns-script", "Filename containing an optional 'lua' script that will be used to modify dns answers")="";
     ::arg().set("latency-statistic-size","Number of latency values to calculate the qa-latency average")="10000";
-//    ::arg().setSwitch( "disable-edns-ping", "Disable EDNSPing - EXPERIMENTAL, LEAVE DISABLED" )= "no";
-    ::arg().setSwitch( "disable-edns", "Disable EDNS - EXPERIMENTAL, LEAVE DISABLED" )= "";
     ::arg().setSwitch( "disable-packetcache", "Disable packetcache" )= "no";
     ::arg().set("edns-subnet-whitelist", "List of netmasks and domains that we should enable EDNS subnet for")="powerdns.com,82.94.213.34,2001:888:2000:1d::2";
     ::arg().setSwitch( "pdns-distributes-queries", "If PowerDNS itself should distribute queries over threads")="";