]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
remove fancy-record options 1650/head
authorKees Monshouwer <mind04@monshouwer.org>
Wed, 30 Jul 2014 15:22:22 +0000 (17:22 +0200)
committermind04 <mind04@monshouwer.org>
Wed, 30 Jul 2014 17:48:26 +0000 (19:48 +0200)
13 files changed:
pdns/common_startup.cc
pdns/docs/pdns.xml
pdns/packethandler.cc
pdns/packethandler.hh
pdns/pdns.conf-dist
pdns/receiver.cc
pdns/zone2json.cc
pdns/zone2lmdb.cc
pdns/zone2sql.cc
regression-tests.nobackend/edns-packet-cache/command
regression-tests/tests/fancy-axfr/command [deleted file]
regression-tests/tests/fancy-axfr/description [deleted file]
regression-tests/tests/fancy-axfr/expected_result [deleted file]

index 5a556e96c87e2107e3a7c8850516b89234b76dfd..a218c696ad596229248f7d58893fab5125614be2 100644 (file)
@@ -48,8 +48,6 @@ void declareArguments()
   ::arg().setSwitch("forward-2136","A global setting to allow RFC2136 packages that are for a Slave domain, to be forwarded to the master.")="yes";
   ::arg().setSwitch("log-dns-details","If PDNS should log DNS non-erroneous details")="no";
   ::arg().setSwitch("log-dns-queries","If PDNS should log all incoming DNS queries")="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";
   ::arg().setSwitch("local-address-nonexist-fail","Fail to start if one or more of the local-address's do not exist on this server")="yes";
   ::arg().set("local-ipv6","Local IP address to which we bind")="";
@@ -74,8 +72,6 @@ void declareArguments()
   
   ::arg().set("version-string","PowerDNS version in packets - full, anonymous, powerdns or custom")="full"; 
   ::arg().set("control-console","Debugging switch - don't use")="no"; // but I know you will!
-  ::arg().set("fancy-records","Process URL and MBOXFW records")="no";
-  ::arg().set("wildcard-url","Process URL and MBOXFW records")="no";
   ::arg().set("loglevel","Amount of logging. Higher is more. Do not set below 3")="4";
   ::arg().set("default-soa-name","name to insert in the SOA record if none set in the backend")="a.misconfigured.powerdns.server";
   ::arg().set("default-soa-mail","mail address to insert in the SOA record if none set in the backend")="";
index ebaf7adad9a0b60593ecac2b757ebdaf136d7097..b301fdad4b53b37e07f4cb6a8b08765850fe86ec 100644 (file)
@@ -12914,6 +12914,14 @@ UPDATE records SET auth=1 WHERE auth IS NULL;
               </para>
             </listitem>
           </varlistentry>
+          <varlistentry>
+            <term>fancy-records</term>
+            <listitem>
+              <para>
+                Process URL and MBOXFW records
+              </para>
+            </listitem>
+          </varlistentry>
           <varlistentry>
             <term>log-failed-updates</term>
             <listitem>
@@ -12922,6 +12930,30 @@ UPDATE records SET auth=1 WHERE auth IS NULL;
               </para>
             </listitem>
           </varlistentry>
+          <varlistentry>
+            <term>smtpredirector</term>
+            <listitem>
+              <para>
+                Our smtpredir MX host
+              </para>
+            </listitem>
+          </varlistentry>
+          <varlistentry>
+            <term>urlredirector</term>
+            <listitem>
+              <para>
+                Where we send hosts to that need to be url redirected
+              </para>
+            </listitem>
+          </varlistentry>
+          <varlistentry>
+            <term>wildcard-url</term>
+            <listitem>
+              <para>
+                Process URL and MBOXFW records
+              </para>
+            </listitem>
+          </varlistentry>
         </variablelist>
       </sect3>
       <sect3><title>Options with changed default values</title>
index b43e0dbe757a36ef276bfe3871e6cf2f7a154f56..a864404db2e1b6c55d74517765c90f15fae26cd5 100644 (file)
@@ -61,7 +61,6 @@ enum root_referral {
 PacketHandler::PacketHandler():B(s_programname)
 {
   ++s_count;
-  d_doFancyRecords = (::arg()["fancy-records"]!="no");
   d_doDNAME=::arg().mustDo("experimental-dname-processing");
   d_doRecursion= ::arg().mustDo("recursor");
   d_logDNSDetails= ::arg().mustDo("log-dns-details");
@@ -129,92 +128,6 @@ void PacketHandler::addRootReferral(DNSPacket* r)
   }
 }
 
-int PacketHandler::findMboxFW(DNSPacket *p, DNSPacket *r, string &target)
-{
-  DNSResourceRecord rr;
-  bool wedoforward=false;
-
-  SOAData sd;
-  int zoneId;
-  if(!B.getAuth(p, &sd, target, &zoneId))
-    return false;
-
-  B.lookup(QType(QType::MBOXFW),string("%@")+target,p, zoneId);
-      
-  while(B.get(rr))
-    wedoforward=true;
-
-  if(wedoforward) {
-    r->clearRecords();
-    rr.content=::arg()["smtpredirector"];
-    rr.priority=25;
-    rr.ttl=7200;
-    rr.qtype=QType::MX;
-    rr.qname=target;
-    
-    r->addRecord(rr);
-  }
-
-  return wedoforward;
-}
-
-int PacketHandler::findUrl(DNSPacket *p, DNSPacket *r, string &target)
-{
-  DNSResourceRecord rr;
-
-  bool found=false;
-      
-  B.lookup(QType(QType::URL),target,p); // search for a URL before we search for an A
-        
-  while(B.get(rr)) {
-    if(!found) 
-      r->clearRecords();
-    found=true;
-    DLOG(L << "Found a URL!" << endl);
-    rr.content=::arg()["urlredirector"];
-    rr.qtype=QType::A; 
-    rr.qname=target;
-          
-    r->addRecord(rr);
-  }  
-
-  if(found) 
-    return 1;
-
-  // now try CURL
-  
-  B.lookup(QType(QType::CURL),target,p); // search for a URL before we search for an A
-      
-  while(B.get(rr)) {
-    if(!found) 
-      r->clearRecords();
-    found=true;
-    DLOG(L << "Found a CURL!" << endl);
-    rr.content=::arg()["urlredirector"];
-    rr.qtype=1; // A
-    rr.qname=target;
-    rr.ttl=300;
-    r->addRecord(rr);
-  }  
-
-  if(found)
-    return found;
-  return 0;
-}
-
-/** Returns 0 if nothing was found, -1 if an error occurred or 1 if the search
-    was satisfied */
-int PacketHandler::doFancyRecords(DNSPacket *p, DNSPacket *r, string &target)
-{
-  DNSResourceRecord rr;
-  if(p->qtype.getCode()==QType::MX)  // check if this domain has smtp service from us
-    return findMboxFW(p,r,target);
-  
-  if(p->qtype.getCode()==QType::A)   // search for a URL record for an A
-    return findUrl(p,r,target);
-  return 0;
-}
-
 /** This adds DNSKEY records. Returns true if one was added */
 bool PacketHandler::addDNSKEY(DNSPacket *p, DNSPacket *r, const SOAData& sd)
 {
@@ -1162,12 +1075,6 @@ DNSPacket *PacketHandler::questionOrRecurse(DNSPacket *p, bool *shouldRecurse)
       return r;
     }
 
-    // please don't query fancy records directly!
-    if(d_doFancyRecords && (p->qtype.getCode()==QType::URL || p->qtype.getCode()==QType::CURL || p->qtype.getCode()==QType::MBOXFW)) {
-      r->setRcode(RCode::ServFail);
-      return r;
-    }
-
     // for qclass ANY the response should never be authoritative unless the response covers all classes.
     if(p->qclass==QClass::ANY)
       r->setA(false);
index 630f4d939db07c3060baf89f26aee7f2464449ee..a9eab5ba402c7c45f950e233634b4843fcca825e 100644 (file)
@@ -70,9 +70,6 @@ private:
   int processNotify(DNSPacket *);
   void addRootReferral(DNSPacket *r);
   int makeCanonic(DNSPacket *p, DNSPacket *r, string &target);
-  int findMboxFW(DNSPacket *p, DNSPacket *r, string &target);
-  int findUrl(DNSPacket *p, DNSPacket *r, string &target);
-  int doFancyRecords(DNSPacket *p, DNSPacket *r, string &target);
   int doChaosRequest(DNSPacket *p, DNSPacket *r, string &target);
   bool addDNSKEY(DNSPacket *p, DNSPacket *r, const SOAData& sd);
   bool addNSEC3PARAM(DNSPacket *p, DNSPacket *r, const SOAData& sd);
@@ -106,7 +103,6 @@ private:
   
   static AtomicCounter s_count;
   static pthread_mutex_t s_rfc2136lock;
-  bool d_doFancyRecords;
   bool d_doRecursion;
   bool d_logDNSDetails;
   bool d_doIPv6AdditionalProcessing;
index 1e29178c62f071ab700527671b8f398cf2bfd92f..a1573fb1ca0cc0d5af65980da4c1504d5027b6e5 100644 (file)
 #
 # experimental-rfc2136=no
 
-#################################
-# fancy-records        Process URL and MBOXFW records
-#
-# fancy-records=no
-
 #################################
 # forward-2136 A global setting to allow RFC2136 packages that are for a Slave domain, to be forwarded to the master.
 #
 #
 # slave-renotify=no
 
-#################################
-# smtpredirector       Our smtpredir MX host
-#
-# smtpredirector=a.misconfigured.powerdns.smtp.server
-
 #################################
 # soa-expire-default   Default SOA expire
 #
 #
 # udp-truncation-threshold=1680
 
-#################################
-# urlredirector        Where we send hosts to that need to be url redirected
-#
-# urlredirector=127.0.0.1
-
 #################################
 # version-string       PowerDNS version in packets - full, anonymous, powerdns or custom
 #
 #
 # webserver-print-arguments=no
 
-#################################
-# wildcard-url Process URL and MBOXFW records
-#
-# wildcard-url=no
-
 
index 28fe649045905e9450a42e7a983579e30ba3b40c..af38f2bbaeebbbd8a217de9198e9628e911cce9f 100644 (file)
@@ -528,10 +528,6 @@ int main(int argc, char **argv)
       exit(99);
     }
 
-    if(::arg().mustDo("fancy-records")) {
-      reportFancyTypes();
-    }
-
     if(!::arg().asNum("local-port")) {
       L<<Logger::Error<<"Unable to launch, binding to no port or port 0 makes no sense"<<endl;
       exit(99); // this isn't going to fix itself either
index 82bbfddc2a80fe7c0d45dfb85da0552465b5fd4d..86c5ffff1cb02089062519e21600f35521ce25bf 100644 (file)
@@ -130,7 +130,6 @@ try
   vector<string> lines;
 
     reportAllTypes();
-    reportFancyTypes();
 #if __GNUC__ >= 3
     std::ios_base::sync_with_stdio(false);
 #endif
index 52aa9a43d539f0c0e4a41d8aaea7add122b8612e..f62ee8f571e49119224fe67accf95eb55d1f6bcd 100644 (file)
@@ -197,7 +197,6 @@ int main(int argc, char **argv)
 try
 {
   reportAllTypes();
-  reportFancyTypes();
 #if __GNUC__ >= 3
   std::ios_base::sync_with_stdio(false);
 #endif
index e8670e2b125105c162d752625d6bfb9afe7e0008..003047622d9c47ae247c46c9a211db270a69ff00 100644 (file)
@@ -280,7 +280,6 @@ int main(int argc, char **argv)
 try
 {
     reportAllTypes();
-    reportFancyTypes();
 #if __GNUC__ >= 3
     std::ios_base::sync_with_stdio(false);
 #endif
index 1c4414f16248d591c4a37491f1e671a5caaf9b02..ff5713e110c8d1cb8573c0fd8eea6c5e97bba651 100755 (executable)
@@ -26,8 +26,7 @@ rm -f pdns*.pid
 
 ../pdns/pdns_server --daemon=no --local-port=$port --socket-dir=./          \
        --no-shuffle --launch=bind --bind-config=edns-packet-cache/named.conf   \
-       --fancy-records --send-root-referral                                    \
-       --cache-ttl=60 --no-config &
+       --send-root-referral --cache-ttl=60 --no-config &
 bindwait
        
 # prime cache without EDNS
diff --git a/regression-tests/tests/fancy-axfr/command b/regression-tests/tests/fancy-axfr/command
deleted file mode 100755 (executable)
index 50b8bf0..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-#cleandig example.com AXFR @$nameserver
\ No newline at end of file
diff --git a/regression-tests/tests/fancy-axfr/description b/regression-tests/tests/fancy-axfr/description
deleted file mode 100644 (file)
index 8e70c9c..0000000
+++ /dev/null
@@ -1 +0,0 @@
-This tries to transfer a small zone with fancy records over AXFR.
diff --git a/regression-tests/tests/fancy-axfr/expected_result b/regression-tests/tests/fancy-axfr/expected_result
deleted file mode 100644 (file)
index e69de29..0000000