From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Tue, 15 Dec 2015 11:51:46 +0000 (+0100)
Subject: Relax constraints accepting answers from forwarders
X-Git-Tag: dnsdist-1.0.0-alpha1~51^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=73c32d1bfa5ba0c8c96dbfdd9810c785c0c270dc;p=pdns

Relax constraints accepting answers from forwarders

This patch relaxes our constraints on accepting answers from forwarders,
who can' t be expected to always set an AA bit for us, especially not
when asking for recursion.

Closes #2841
---

diff --git a/pdns/syncres.cc b/pdns/syncres.cc
index a974da6c7..7f6baaf96 100644
--- a/pdns/syncres.cc
+++ b/pdns/syncres.cc
@@ -1342,7 +1342,7 @@ int SyncRes::doResolveAt(set<DNSName> nameservers, DNSName auth, bool flawedNSSe
 
         return RCode::NXDomain;
       }
-      if(nsset.empty() && !lwr.d_rcode && (negindic || lwr.d_aabit)) {
+      if(nsset.empty() && !lwr.d_rcode && (negindic || lwr.d_aabit || sendRDQuery)) {
         LOG(prefix<<qname.toString()<<": status=noerror, other types may exist, but we are done "<<(negindic ? "(have negative SOA) " : "")<<(lwr.d_aabit ? "(have aa bit) " : "")<<endl);
 	addNXNSECS(ret, lwr.d_records);
         return 0;