remove no-op option allow-recursion-override

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@2614 d19b8d6e-7fed-0310-83ef-9ca221ded41b

diff --git a/pdns/common_startup.cc b/pdns/common_startup.cc
index 99c3affd5a9ed1731573aea718428bf0b882908b..6e2cdaeca654df2819be228c6d3e207615a0c013 100644 (file)
--- a/pdns/common_startup.cc
+++ b/pdns/common_startup.cc
@@ -42,7 +42,6 @@ void declareArguments()
   ::arg().setSwitch("log-failed-updates","If PDNS should log failed update requests")="";
   ::arg().setSwitch("log-dns-details","If PDNS should log DNS non-erroneous details")="";
   ::arg().setSwitch("log-dns-queries","If PDNS should log all incoming DNS queries")="no";
-  ::arg().setSwitch("allow-recursion-override","Set this so that local data fully overrides the recursor")="no";
   ::arg().set("urlredirector","Where we send hosts to that need to be url redirected")="127.0.0.1";
   ::arg().set("smtpredirector","Our smtpredir MX host")="a.misconfigured.powerdns.smtp.server";
   ::arg().set("local-address","Local IP addresses to which we bind")="0.0.0.0";

diff --git a/pdns/docs/pdns.xml b/pdns/docs/pdns.xml
index 04547999ef46c0828dc77686571cd6c352edc766..542380d9e8848b2af1900f53e4a205740201add2 100644 (file)
--- a/pdns/docs/pdns.xml
+++ b/pdns/docs/pdns.xml
@@ -11675,7 +11675,7 @@ sql> insert into domainmetadata (domain_id, kind, content) values (7,'ALLOW-AXFR
        If that succeeds, the answer packet is sent back immediately without involving the recursor in any way. This means that for questions for which there is no answer, PowerDNS will consult the recursor for an recursive query, even if PowerDNS is authoritative for a domain! This will only cause problems if you 'fake' domains which don't really exist.
       </para>
       <para>
-       If you want to create such fake domains or override existing domains, please set the <command>allow-recursion-override</command> feature (available as of 2.9.14).
+       If you want to create such fake domains or override existing domains, please set the <command>allow-recursion-override</command> feature (available from 2.9.14 until 2.9.22.6).
       </para>
       <para>
        Some packets, like those asking for MX records which are needed for SMTP transport of email, can be subject to 'additional processing'. This means
@@ -13345,8 +13345,7 @@ To enable a Lua script for a particular slave zone, determine the domain_id for
          <listitem>
            <para>
              By specifying <command>allow-recursion-override</command>, local data even about hosts that don't exist will override
-             the internet. This allows you to generate zones that don't really exist on the internet. Does increase the number of SQL queries for hosts that truly don't exist, also not in your database.
-
+             the internet. This allows you to generate zones that don't really exist on the internet. Does increase the number of SQL queries for hosts that truly don't exist, also not in your database. (Setting did nothing in 3.0 and 3.1, removed in 3.1.1).
            </para>
          </listitem></varlistentry>
          <varlistentry><term>cache-ttl=...</term>

diff --git a/pdns/pdns.conf-dist b/pdns/pdns.conf-dist
index 804b57c46ae884ffce6215ca02201a9609a56301..4fe357e83e022584c27e80bf16a0aad99fb51949 100644 (file)
--- a/pdns/pdns.conf-dist
+++ b/pdns/pdns.conf-dist
@@ -9,11 +9,6 @@
 #
 # allow-recursion=0.0.0.0/0
 
-#################################
-# allow-recursion-override     Set this so that local data fully overrides the recursor
-#
-# allow-recursion-override=no
-
 #################################
 # cache-ttl    Seconds to store packets in the PacketCache
 #