remove unused doWildcardRecords method, pointed out by Leen Besselink

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

diff --git a/pdns/packethandler.cc b/pdns/packethandler.cc
index 1adfcc4b0ec704417ea7143ceeb522b3c086bf38..6f0da29d381beb917735bb90f800b52a76a16a03 100644 (file)
--- a/pdns/packethandler.cc
+++ b/pdns/packethandler.cc
@@ -352,72 +352,6 @@ bool PacketHandler::getBestWildcard(DNSPacket *p, SOAData& sd, const string &tar
   return haveSomething;
 }
 
-
-/** returns 1 in case of a straight match, 2 in case of a wildcard CNAME (groan), 0 in case of no hit */
-int PacketHandler::doWildcardRecords(DNSPacket *p, DNSPacket *r, string &target)
-{
-  DNSResourceRecord rr;
-  bool found=false, retargeted=false;
-
-  // try chopping off domains and look for wildcard matches
-
-  // *.pietje.nl IN  A 1.2.3.4
-  // pietje.nl should now NOT match, but www.pietje.nl should
-
-  string subdomain=target;
-  string::size_type pos;
-
-  while((pos=subdomain.find("."))!=string::npos) {
-    subdomain=subdomain.substr(pos+1);
-    // DLOG();
-
-    string searchstr=string("*.")+subdomain;
-
-    B.lookup(QType(QType::ANY), searchstr,p); // start our search at the backend
-
-    while(B.get(rr)) { // read results
-      if(retargeted)
-        continue;
-      found=true;
-      if((p->qtype.getCode()==QType::ANY || rr.qtype==p->qtype) || rr.qtype.getCode()==QType::CNAME) {
-        rr.qname=target;
-
-        if(d_doFancyRecords && p->qtype.getCode()==QType::ANY && (rr.qtype.getCode()==QType::URL || rr.qtype.getCode()==QType::CURL)) {
-          rr.content=::arg()["urlredirector"];
-          rr.qtype=QType::A; 
-        }
-
-        r->addRecord(rr);  // and add
-        if(rr.qtype.getCode()==QType::CNAME) {
-          if(target==rr.content) {
-            L<<Logger::Error<<"Ignoring wildcard CNAME '"<<rr.qname<<"' pointing at itself"<<endl;
-            r->setRcode(RCode::ServFail);
-            continue;
-          }
-          
-          DLOG(L<<Logger::Error<<"Retargeting because of wildcard cname, from "<<target<<" to "<<rr.content<<endl);
-          
-          target=rr.content; // retarget 
-          retargeted=true;
-        }
-      }
-      else if(d_doFancyRecords && ::arg().mustDo("wildcard-url") && p->qtype.getCode()==QType::A && rr.qtype.getName()=="URL") {
-        rr.content=::arg()["urlredirector"];
-        rr.qtype=QType::A; 
-        rr.qname=target;
-        
-        r->addRecord(rr);
-      }
-    }
-    if(found) {
-      DLOG(L<<"Wildcard match on '"<<string("*.")+subdomain<<"'"<<", retargeted="<<retargeted<<endl);
-      return retargeted ? 2 : 1;
-    }
-  }
-  DLOG(L<<"Returning no hit for '"<<string("*.")+subdomain<<"'"<<endl);
-  return 0;
-}
-
 /** dangling is declared true if we were unable to resolve everything */
 int PacketHandler::doAdditionalProcessingAndDropAA(DNSPacket *p, DNSPacket *r, const SOAData& soadata)
 {

diff --git a/pdns/packethandler.hh b/pdns/packethandler.hh
index 946f1bf413ac3dd8ef02c120982e90d352b11275..c9d5f2b0e614fc5e8041e8b773505d2232b67924 100644 (file)
--- a/pdns/packethandler.hh
+++ b/pdns/packethandler.hh
@@ -88,7 +88,6 @@ private:
   int processNotify(DNSPacket *);
   void addRootReferral(DNSPacket *r);
   int makeCanonic(DNSPacket *p, DNSPacket *r, string &target);
-  int doWildcardRecords(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);