Changeset 1871

Timestamp:

01/11/11 21:08:46 (2 years ago)

Author:

ahu

Message:

restore NSEC generation & signatures for AXFR.

Location:

trunk/pdns/pdns

Files:

• dnsbackend.cc (modified) (2 diffs)
• tcpreceiver.cc (modified) (5 diffs)

trunk/pdns/pdns/dnsbackend.cc

@@ -209 +209 @@
 {
   this->lookup(QType(QType::SOA),domain,p);
-
+  
   DNSResourceRecord rr;
   rr.auth = true; 
@@ -224 +224 @@
   if(!hits)
     return false;
-
+  sd.qname = domain;
   if(sd.nameserver.empty())
     sd.nameserver=arg()["default-soa-name"];

trunk/pdns/pdns/tcpreceiver.cc

@@ -433 +433 @@
     }
 
-    if(!s_P->getBackend()->getSOA(target,sd)) {
+    if(!s_P->getBackend()->getSOA(target, sd)) {
       L<<Logger::Error<<"AXFR of domain '"<<target<<"' failed: not authoritative"<<endl;
       outpacket->setRcode(9); // 'NOTAUTH'
@@ -485 +485 @@
   typedef map<string, NSECEntry, CanonicalCompare> nsecrepo_t;
   nsecrepo_t nsecrepo;
-  // this is where the DNSKEYs go
-  
+  // this is where the DNSKEYs go  
 
   DNSSECKeeper::keyset_t keys = dk.getKeys(target);
@@ -500 +499 @@
     outpacket->addRecord(rr);
   }
-
   /* now write all other records */
 
@@ -537 +535 @@
     }
   }
-
-  if(dk.haveActiveKSKFor(sd.qname)) {
+  
+  if(dk.haveActiveKSKFor(target)) {
     for(nsecrepo_t::const_iterator iter = nsecrepo.begin(); iter != nsecrepo.end(); ++iter) {
-      cerr<<"Adding for '"<<iter->first<<"'\n";
+  //    cerr<<"Adding for '"<<iter->first<<"'\n";
       NSECRecordContent nrc;
       nrc.d_set = iter->second.d_set;
@@ -557 +555 @@
       rr.qtype = QType::NSEC;
       rr.d_place = DNSResourceRecord::ANSWER;
+      rr.auth=true;
       outpacket->addRecord(rr);
       count++;