From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Fri, 9 Nov 2018 19:15:56 +0000 (+0100)
Subject: auth: use domainid in additional processing lookup
X-Git-Tag: auth-4.2.0-alpha1~25^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6a1e86d74f052c8b811e01edbca01312696ca5f3;p=thirdparty%2Fpdns.git

auth: use domainid in additional processing lookup
---

diff --git a/pdns/packethandler.cc b/pdns/packethandler.cc
index 43193b2ab3..2ad9f567af 100644
--- a/pdns/packethandler.cc
+++ b/pdns/packethandler.cc
@@ -458,16 +458,11 @@ int PacketHandler::doAdditionalProcessingAndDropAA(DNSPacket *p, DNSPacket *r, c
       else
         continue;
 
-      B.lookup(QType(d_doIPv6AdditionalProcessing ? QType::ANY : QType::A), lookup, p);
+      B.lookup(QType(d_doIPv6AdditionalProcessing ? QType::ANY : QType::A), lookup, p, sd.domain_id);
 
       while(B.get(rr)) {
         if(rr.dr.d_type != QType::A && rr.dr.d_type!=QType::AAAA)
           continue;
-        if(rr.domain_id!=i->domain_id || !rr.dr.d_name.isPartOf(soadata.qname)) {
-          // FIXME we might still pass on the record if it is occluded and the
-          // backend does not report a different ID
-          continue; // not adding out-of-zone additional data
-        }
         rr.dr.d_place=DNSResourceRecord::ADDITIONAL;
         toAdd.push_back(rr);
       }