remove all traces of fancy records

diff --git a/docs/markdown/authoritative/backend-pipe.md b/docs/markdown/authoritative/backend-pipe.md
index ccc84a62dd09d83519c6760468686b10c83fbb14..ce68d6005c8464d376dcf8debb3ccf3c57cacd7d 100644 (file)
--- a/docs/markdown/authoritative/backend-pipe.md
+++ b/docs/markdown/authoritative/backend-pipe.md
@@ -61,7 +61,6 @@ Please adjust the [`pipe-command`](#pipe-command) statement to the location of t
 
 -   webserver.example.com A records pointing to 192.0.2.4, 192.0.2.5, 192.0.2.6
 -   www.example.com CNAME pointing to webserver.example.com
--   MBOXFW (mailbox forward) records pointing to powerdns@example.com. See the smtpredir documentation for information about MBOXFW.
 
 ## PipeBackend protocol
 

diff --git a/docs/markdown/authoritative/upgrading.md b/docs/markdown/authoritative/upgrading.md
index 77cd7f582baa24fca7415b2a310f826aca090358..2c2de5301f408bb796a5424cd57a6a5468d31ce7 100644 (file)
--- a/docs/markdown/authoritative/upgrading.md
+++ b/docs/markdown/authoritative/upgrading.md
@@ -261,7 +261,7 @@ When compiling version 3.0, there are now more dependencies than there used to b
 
 PowerDNS Authoritative Server 3.0 comes with DNSSEC support, but this has required big changes to database schemas. Each backend lists the changes required. To facilitate a smooth upgrade, the old, non-DNSSEC schema is used by default. Features like per-domain metadata, TSIG and DNSSEC itself however need the new schema. Consult your backend documentation for the correct 'alter table' statements. Afterwards, set the relevant '-dnssec' setting for your backend (for example: gmysql-dnssec).
 
-In version 3.0, "Fancy Records", like URL, CURL and MBOXFW are no longer supported. Support may come back in later versions. In addition, the LDAP Backend has moved to 'unmaintained' status.
+In version 3.0, "Fancy Records", like URL, CURL and MBOXFW are no longer supported. In addition, the LDAP Backend has moved to 'unmaintained' status.
 
 ## Frequently Asked Questions about 3.0
 

diff --git a/modules/pipebackend/backend.pl b/modules/pipebackend/backend.pl
index 2bd6acfbe8785dbeb9c5da0461427835fb83bd99..583e346035aeb4506c40413abcb50619fb596d29 100755 (executable)
--- a/modules/pipebackend/backend.pl
+++ b/modules/pipebackend/backend.pl
@@ -54,10 +54,6 @@ while(<>)
                print STDERR "$$ Sent CNAME records\n";
                print "DATA     $qname  $qclass CNAME   3600    -1      webserver.example.com\n";
        }
-       elsif($qtype eq "MBOXFW") {
-               print STDERR "$$ Sent MBOXFW records\n";
-               print "DATA     $qname  $qclass MBOXFW  3600    -1      powerdns\@example.com\n";
-       }
 
 
        print STDERR "$$ End of data\n";

diff --git a/pdns/dnsrecords.cc b/pdns/dnsrecords.cc
index 6e187bd65afb02fa04c50953a718699f0b3bef2e..6a0b24aa447c2747dfae802ee3f7258e0562d08b 100644 (file)
--- a/pdns/dnsrecords.cc
+++ b/pdns/dnsrecords.cc
@@ -426,17 +426,6 @@ uint16_t DNSKEYRecordContent::getTag()
   return ac & 0xFFFF;
 }
 
-// "fancy records" 
-boilerplate_conv(URL, QType::URL, 
-                 conv.xfrLabel(d_url);
-                 )
-
-boilerplate_conv(MBOXFW, QType::MBOXFW, 
-                 conv.xfrLabel(d_mboxfw);
-                 )
-
-
-
 bool getEDNSOpts(const MOADNSParser& mdp, EDNSOpts* eo)
 {
   if(mdp.d_header.arcount && !mdp.d_answers.empty()) {
@@ -509,12 +498,6 @@ void reportOtherTypes()
    MINFORecordContent::report();
 }
 
-void reportFancyTypes()
-{
-  URLRecordContent::report();
-  MBOXFWRecordContent::report();
-}
-
 void reportAllTypes()
 {
   reportBasicTypes();

diff --git a/pdns/dnsrecords.hh b/pdns/dnsrecords.hh
index 6ecdce4a548b5fe446176cc1883bf13577b56ffd..05e64e13fa2f2c180e6abad5756672cf646f58ef 100644 (file)
--- a/pdns/dnsrecords.hh
+++ b/pdns/dnsrecords.hh
@@ -505,23 +505,6 @@ public:
 private:
 };
 
-
-class URLRecordContent : public DNSRecordContent // Fake, 'fancy record' with type 256
-{
-public:
-  includeboilerplate(URL)
-private:
-  string d_url;
-};
-
-class MBOXFWRecordContent : public DNSRecordContent // Fake, 'fancy record' with type 256
-{
-public:
-  includeboilerplate(MBOXFW)
-private:
-  string d_mboxfw;
-};
-
 class EUI48RecordContent : public DNSRecordContent 
 {
 public:
@@ -628,6 +611,5 @@ bool getEDNSOpts(const MOADNSParser& mdp, EDNSOpts* eo);
 void reportBasicTypes();
 void reportOtherTypes();
 void reportAllTypes();
-void reportFancyTypes();
 
 #endif 

diff --git a/pdns/pdnssec.cc b/pdns/pdnssec.cc
index 99ac43d5befd6169347dd1a436aad966a615fcbe..851610589bbbb995e5fd637090cb603c3f721aea 100644 (file)
--- a/pdns/pdnssec.cc
+++ b/pdns/pdnssec.cc
@@ -552,12 +552,6 @@ int checkZone(DNSSECKeeper &dk, UeberBackend &B, const std::string& zone)
       }
     }
 
-    if(rr.qtype.getCode() == QType::URL || rr.qtype.getCode() == QType::MBOXFW) {
-      cout<<"[Error] The recordtype "<<rr.qtype.getName()<<" for record '"<<rr.qname<<"' is no longer supported."<<endl;
-      numerrors++;
-      continue;
-    }
-
     if (rr.qname[rr.qname.size()-1] == '.') {
       cout<<"[Error] Record '"<<rr.qname<<"' has a trailing dot. PowerDNS will ignore this record!"<<endl;
       numerrors++;

diff --git a/pdns/qtype.hh b/pdns/qtype.hh
index afba9cbdb9399e74232462d07d61febe03d24f6b..f846861cfee415b022b1cdf8b9c5381c0bd791d6 100644 (file)
--- a/pdns/qtype.hh
+++ b/pdns/qtype.hh
@@ -82,7 +82,7 @@ public:
 #undef DS
   enum typeenum {A=1, NS=2, CNAME=5, SOA=6, MR=9, WKS=11, PTR=12, HINFO=13, MINFO=14, MX=15, TXT=16, RP=17, AFSDB=18, SIG=24, KEY=25, AAAA=28, LOC=29, SRV=33, NAPTR=35, KX=36,
                 CERT=37, A6=38, DNAME=39, OPT=41, DS=43, SSHFP=44, IPSECKEY=45, RRSIG=46, NSEC=47, DNSKEY=48, DHCID=49, NSEC3=50, NSEC3PARAM=51,
-                TLSA=52, SPF=99, EUI48=108, EUI64=109, TSIG=250, IXFR=251, AXFR=252, MAILB=253, MAILA=254, ANY=255, URL=256, MBOXFW=257, CURL=258, ADDR=259, ALIAS=260, DLV=32769} types;
+                TLSA=52, SPF=99, EUI48=108, EUI64=109, TSIG=250, IXFR=251, AXFR=252, MAILB=253, MAILA=254, ANY=255, ADDR=259, ALIAS=260, DLV=32769} types;
   typedef pair<string,uint16_t> namenum;
   static vector<namenum> names;
 
@@ -162,9 +162,6 @@ private:
       qtype_insert("MAILB", 253);
       qtype_insert("MAILA", 254);
       qtype_insert("ANY", 255);
-      qtype_insert("URL", 256);
-      qtype_insert("MBOXFW", 257);
-      qtype_insert("CURL", 258);
       qtype_insert("ADDR", 259);
       qtype_insert("ALIAS", 260);
       qtype_insert("DLV", 32769);

diff --git a/pdns/test-dnsrecords_cc.cc b/pdns/test-dnsrecords_cc.cc
index e320b10db10e6e161133857103742cdc9bffb149..341e6297bdbac0ca3bbb94ea60fcd9e89ea0ad69 100644 (file)
--- a/pdns/test-dnsrecords_cc.cc
+++ b/pdns/test-dnsrecords_cc.cc
@@ -24,8 +24,6 @@ BOOST_AUTO_TEST_CASE(test_record_types) {
   MRRecordContent::report();
   IPSECKEYRecordContent::report();
   KXRecordContent::report();
-  URLRecordContent::report();
-  MBOXFWRecordContent::report();
   DHCIDRecordContent::report();
   TSIGRecordContent::report();
 
@@ -156,10 +154,7 @@ BOOST_AUTO_TEST_CASE(test_record_types) {
      (CASE_S(QType::EUI64, "00-11-22-33-44-55-66-77", "\x00\x11\x22\x33\x44\x55\x66\x77",false))
      (CASE_S(QType::TSIG, "HMAC-MD5.SIG-ALG.REG.INT. 1368386956 60 16 TkbpD66/Mtgo8GUEFZIwhg== 12345 0 0", "\x08HMAC-MD5\x07SIG-ALG\x03REG\x03INT\x00\x00\x00\x51\x8f\xed\x8c\x00\x3c\x00\x10\x4e\x46\xe9\x0f\xae\xbf\x32\xd8\x28\xf0\x65\x04\x15\x92\x30\x86\x30\x39\x00\x00\x00\x00",false))
      (CASE_S(QType::TSIG, "HMAC-MD5.SIG-ALG.REG.INT. 1368386956 60 16 TkbpD66/Mtgo8GUEFZIwhg== 12345 18 16 TkbpD66/Mtgo8GUEFZIwhg==", "\x08HMAC-MD5\x07SIG-ALG\x03REG\x03INT\x00\x00\x00\x51\x8f\xed\x8c\x00\x3c\x00\x10\x4e\x46\xe9\x0f\xae\xbf\x32\xd8\x28\xf0\x65\x04\x15\x92\x30\x86\x30\x39\x00\x12\x00\x10\x4e\x46\xe9\x0f\xae\xbf\x32\xd8\x28\xf0\x65\x04\x15\x92\x30\x86",true))
-/*     (CASE_S(QType::URL, "http://server.rec.test/", "\x17http://server.rec.test/",false))
-       (CASE_S(QType::MBOXFW, "you@yourcompany.com", "line format",false))
-       (CASE_S(QType::CURL, "http://server.rec.test/", "\x17http://server.rec.test/",false))
-       (CASE_S(QType::ADDR, "zone format", "line format",false)) */
+/*        (CASE_S(QType::ADDR, "zone format", "line format",false)) */
      (CASE_S(QType::DLV, "20642 8 2 04443abe7e94c3985196beae5d548c727b044dda5151e60d7cd76a9fd931d00e", "\x50\xa2\x08\x02\x04\x44\x3a\xbe\x7e\x94\xc3\x98\x51\x96\xbe\xae\x5d\x54\x8c\x72\x7b\x04\x4d\xda\x51\x51\xe6\x0d\x7c\xd7\x6a\x9f\xd9\x31\xd0\x0e",false))
 ;
 

diff --git a/pdns/test-zoneparser_tng_cc.cc b/pdns/test-zoneparser_tng_cc.cc
index 0be7e49222619dc9fa967b4602b686cb5e3b4e95..506fcdff39b7dd074e5bc970432bdbc7c335f3f7 100644 (file)
--- a/pdns/test-zoneparser_tng_cc.cc
+++ b/pdns/test-zoneparser_tng_cc.cc
@@ -17,7 +17,6 @@ BOOST_AUTO_TEST_SUITE(test_zoneparser_tng_cc)
 
 BOOST_AUTO_TEST_CASE(test_tng_record_types) {
   reportAllTypes();
-  reportFancyTypes();
 
   std::ostringstream pathbuf;
   const char* p = std::getenv("SRCDIR");

diff --git a/regression-tests.nobackend/tinydns-data-check/expected_result b/regression-tests.nobackend/tinydns-data-check/expected_result
index d2147509b984f181dea921fc0caa801c0d1031e8..0a03024654100a34ff974b9addc80e0248a2a69e 100644 (file)
--- a/regression-tests.nobackend/tinydns-data-check/expected_result
+++ b/regression-tests.nobackend/tinydns-data-check/expected_result
@@ -1,5 +1,5 @@
 4bc48a8d9b8d04b553be67639e5656e8  ../regression-tests/zones/example.com
-c5d5a2a68d72760b5f6f563eb0a1b6d5  ../regression-tests/zones/test.com
+a51bf8c9748e21582250c11f97de6e39  ../regression-tests/zones/test.com
 005b3381db2a7dc70b690484f6ab7770  ../regression-tests/zones/test.dyndns
 0861783f9f83acd9044278cda2528ee2  ../regression-tests/zones/wtest.com
 42b442de632686e94bde75acf66cf524  ../regression-tests/zones/nztest.com

diff --git a/regression-tests/README.md b/regression-tests/README.md
index 11f6463264bed42a6c2079ec983d51d95c9b07cc..a9d1fcc5be175dc8fa756376298c52697c29bac2 100644 (file)
--- a/regression-tests/README.md
+++ b/regression-tests/README.md
@@ -126,9 +126,6 @@ instance:
 $ nameserver=127.0.0.1 port=5300 ./runtests
 ```
 
-The BIND backend can't do MBOXFW. The `any-query` test is known to fail
-with bind,gsqlite3.
-
 
 Analysing results
 -----------------

diff --git a/regression-tests/tests/mboxfw-record/command b/regression-tests/tests/mboxfw-record/command
deleted file mode 100755 (executable)
index f83f64b..0000000
--- a/regression-tests/tests/mboxfw-record/command
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-cleandig auto.test.com MX
-

diff --git a/regression-tests/tests/mboxfw-record/description b/regression-tests/tests/mboxfw-record/description
deleted file mode 100644 (file)
index a932d2c..0000000
--- a/regression-tests/tests/mboxfw-record/description
+++ /dev/null
@@ -1 +0,0 @@
-Test for the "MBOXFW" fancy-record in PowerDNS

diff --git a/regression-tests/tests/mboxfw-record/expected_result b/regression-tests/tests/mboxfw-record/expected_result
deleted file mode 100644 (file)
index 5436c18..0000000
--- a/regression-tests/tests/mboxfw-record/expected_result
+++ /dev/null
@@ -1,3 +0,0 @@
-0      auto.test.com.  IN      MX      7200    25 a.misconfigured.powerdns.smtp.server.
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='auto.test.com.', qtype=MX

diff --git a/regression-tests/tests/mboxfw-record/skip b/regression-tests/tests/mboxfw-record/skip
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/regression-tests/tests/url-record/command b/regression-tests/tests/url-record/command
deleted file mode 100755 (executable)
index c19a20c..0000000
--- a/regression-tests/tests/url-record/command
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-cleandig images.test.com A

diff --git a/regression-tests/tests/url-record/description b/regression-tests/tests/url-record/description
deleted file mode 100644 (file)
index 0af72fe..0000000
--- a/regression-tests/tests/url-record/description
+++ /dev/null
@@ -1 +0,0 @@
-Test for the "URL" fancy-record in PowerDNS

diff --git a/regression-tests/tests/url-record/expected_result b/regression-tests/tests/url-record/expected_result
deleted file mode 100644 (file)
index e5fec2f..0000000
--- a/regression-tests/tests/url-record/expected_result
+++ /dev/null
@@ -1,3 +0,0 @@
-0      images.test.com.        IN      A       3600    127.0.0.1
-Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
-Reply to question for qname='images.test.com.', qtype=A

diff --git a/regression-tests/tests/url-record/skip b/regression-tests/tests/url-record/skip
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/regression-tests/zones/addzone.com b/regression-tests/zones/addzone.com
index 710bd33db7cef9473014b9a9ef10ac4ecb583144..ccf86721a9f2c7b17a31df5f46859745e3ac3493 100644 (file)
--- a/regression-tests/zones/addzone.com
+++ b/regression-tests/zones/addzone.com
@@ -27,8 +27,6 @@ _double._tcp.dc               IN      SRV     1 100 389 server1
 _root._tcp.dc          IN      SRV     0 0 0 .
 blah                   IN      NS      blah
 blah                   IN      A       192.168.6.1
-;images                        IN      URL     "http://www.ds9a.nl"
-;bert@auto.test.com.                   IN      MBOXFW  "bert@ds9a.nl"
 very-long-txt          IN      TXT     "A very long TXT record! boy you won't believe how long. A very long TXT record! boy you won't believe how long. A very long TXT record! boy you won't believe how long. A very long TXT record! boy you won't believe how long. A very long TXT record! boy you won't believe how long!"
 within-server          IN      CNAME   outpost.example.com.
 _underscore            IN      TXT     "underscores are terrible"

diff --git a/regression-tests/zones/test.com b/regression-tests/zones/test.com
index 2ae567928b1d0c225a71a67cc8836412c2f32344..5080a0b28f65e933803b81da43efc8c7a21a29b5 100644 (file)
--- a/regression-tests/zones/test.com
+++ b/regression-tests/zones/test.com
@@ -28,8 +28,6 @@ _double._tcp.dc               IN      SRV     1 100 389 server1
 _root._tcp.dc          IN      SRV     0 0 0 .
 blah                   IN      NS      blah
 blah                   IN      A       192.168.6.1
-;images                        IN      URL     "http://www.ds9a.nl"
-;bert@auto.test.com.                   IN      MBOXFW  "bert@ds9a.nl"
 very-long-txt          IN      TXT     "A very long TXT record! boy you won't believe how long. A very long TXT record! boy you won't believe how long. A very long TXT record! boy you won't believe how long. A very long TXT record! boy you won't believe how long. A very long TXT record! boy you won't believe how long!"
 within-server          IN      CNAME   outpost.example.com.
 _underscore            IN      TXT     "underscores are terrible"