From: Bert Hubert <bert.hubert@netherlabs.nl>
Date: Mon, 16 Apr 2007 15:38:22 +0000 (+0000)
Subject: no longer recurse for additional records - they are ignored anyhow
X-Git-Tag: pdns-2.9.21~14
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0595c0db6ac3e3a31e351842d55b09318ab7fb0f;p=pdns

no longer recurse for additional records - they are ignored anyhow


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

diff --git a/pdns/packethandler.cc b/pdns/packethandler.cc
index 1b3169816..b2e9683d7 100644
--- a/pdns/packethandler.cc
+++ b/pdns/packethandler.cc
@@ -332,7 +332,7 @@ int PacketHandler::doAdditionalProcessingAndDropAA(DNSPacket *p, DNSPacket *r)
 
       QType qtypes[2];
       qtypes[0]="A"; qtypes[1]="AAAA";
-      for(int n=0;n < d_doIPv6AdditionalProcessing + 1; ++n) {
+      for(int n=0 ; n < d_doIPv6AdditionalProcessing + 1; ++n) {
 	B.lookup(qtypes[n],i->content,p);  
 	bool foundOne=false;
 	while(B.get(rr)) {
@@ -344,26 +344,6 @@ int PacketHandler::doAdditionalProcessingAndDropAA(DNSPacket *p, DNSPacket *r)
 	  
 	  rr.d_place=DNSResourceRecord::ADDITIONAL;
 	  r->addRecord(rr);
-	  
-	}
-	if(!foundOne) {
-	  if(d_doRecursion && DP->recurseFor(p)) {
-	    try {
-	      Resolver resolver;
-	      resolver.resolve(arg()["recursor"],i->content.c_str(),QType::A);
-	      Resolver::res_t res=resolver.result();
-	      for(Resolver::res_t::const_iterator j=res.begin();j!=res.end();++j) {
-		if(j->d_place==DNSResourceRecord::ANSWER) {
-		  rr=*j;
-		  rr.d_place=DNSResourceRecord::ADDITIONAL;
-		  r->addRecord(rr);
-		}
-	      }
-	    }
-	    catch(ResolverException& re) {
-	      // L<<Logger::Error<<"Trying to do additional processing for answer to '"<<p->qdomain<<"' query: "<<re.reason<<endl;
-	    }
-	  }
 	}
       }
     }