Changeset 1930 for trunk/pdns/pdns/packethandler.cc

Timestamp:

01/29/11 13:33:21 (2 years ago)

Author:

ahu

Message:

Christoph Meerwald discovered we would sign out-of-zone additional data, fixed.

Files:

• trunk/pdns/pdns/packethandler.cc (modified) (3 diffs)

trunk/pdns/pdns/packethandler.cc

@@ -398 +398 @@
 
 /** dangling is declared true if we were unable to resolve everything */
-int PacketHandler::doAdditionalProcessingAndDropAA(DNSPacket *p, DNSPacket *r)
+int PacketHandler::doAdditionalProcessingAndDropAA(DNSPacket *p, DNSPacket *r, const SOAData& soadata)
 {
   DNSResourceRecord rr;
@@ -438 +438 @@
             continue; // not adding out-of-zone additional data
           }
-          
+          if(rr.auth && !endsOn(rr.qname, soadata.qname)) // don't sign out of zone data using the main key 
+            rr.auth=false;
           rr.d_place=DNSResourceRecord::ADDITIONAL;
           r->addRecord(rr);
@@ -1349 +1350 @@
     
   sendit:;
-    if(doAdditionalProcessingAndDropAA(p,r)<0)
+    if(doAdditionalProcessingAndDropAA(p, r, sd)<0)
       return 0;