From 73c32d1bfa5ba0c8c96dbfdd9810c785c0c270dc Mon Sep 17 00:00:00 2001
From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Tue, 15 Dec 2015 12:51:46 +0100
Subject: [PATCH] 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
---
 pdns/syncres.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;
-- 
2.40.0