From: Peter van Dijk <peter.van.dijk@netherlabs.nl>
Date: Mon, 22 Apr 2013 13:01:16 +0000 (+0000)
Subject: accept empty NOERROR if it comes with SOA -or- has aa set
X-Git-Tag: auth-3.3-rc1~169
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6ffd6bad382f538f75560903358af9b8748deaeb;p=thirdparty%2Fpdns.git

accept empty NOERROR if it comes with SOA -or- has aa set

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@3172 d19b8d6e-7fed-0310-83ef-9ca221ded41b
---

diff --git a/pdns/syncres.cc b/pdns/syncres.cc
index 49ea49e982..b0a191b0c0 100644
--- a/pdns/syncres.cc
+++ b/pdns/syncres.cc
@@ -1125,8 +1125,8 @@ int SyncRes::doResolveAt(set<string, CIStringCompare> nameservers, string auth,
         LOG(prefix<<qname<<": status=NXDOMAIN, we are done "<<(negindic ? "(have negative SOA)" : "")<<endl);
         return RCode::NXDomain;
       }
-      if(nsset.empty() && !lwr.d_rcode && negindic) {
-        LOG(prefix<<qname<<": status=noerror, other types may exist, but we are done (have negative SOA)"<<endl);
+      if(nsset.empty() && !lwr.d_rcode && (negindic || lwr.d_aabit)) {
+        LOG(prefix<<qname<<": status=noerror, other types may exist, but we are done"<<endl);
         return 0;
       }
       else if(realreferral) {