From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Mon, 14 Dec 2015 15:54:50 +0000 (+0100)
Subject: Remove last remnants of disable-edns
X-Git-Tag: dnsdist-1.0.0-alpha1~61^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ffde15fbd3cc4cdb39d2374d7e6df1546a19dcb1;p=pdns

Remove last remnants of disable-edns
---

diff --git a/docs/markdown/recursor/settings.md b/docs/markdown/recursor/settings.md
index 9a2ea4f64..e06e8fe72 100644
--- 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 7dab9f0a8..52a55c464 100644
--- 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")="";