From: Peter van Dijk <peter.van.dijk@netherlabs.nl>
Date: Fri, 5 Apr 2013 11:01:09 +0000 (+0000)
Subject: don't accept empty NOERROR as authoritative NOERROR, includes test. Reported by Brend... 
X-Git-Tag: rec-3.5-rc5~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d1a197910b8d4ce50d309e34fd9a335aaf60006;p=thirdparty%2Fpdns.git

don't accept empty NOERROR as authoritative NOERROR, includes test. Reported by Brend Predota.

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

diff --git a/pdns/syncres.cc b/pdns/syncres.cc
index 3c677e750a..c66e384e5e 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) {
-        LOG(prefix<<qname<<": status=noerror, other types may exist, but we are done "<<(negindic ? "(have negative SOA)" : "")<<endl);
+      if(nsset.empty() && !lwr.d_rcode && negindic) {
+        LOG(prefix<<qname<<": status=noerror, other types may exist, but we are done (have negative SOA)")<<endl);
         return 0;
       }
       else if(realreferral) {
diff --git a/regression-tests.recursor/config.sh b/regression-tests.recursor/config.sh
index ec7b85d378..bdfe3e0a1b 100755
--- a/regression-tests.recursor/config.sh
+++ b/regression-tests.recursor/config.sh
@@ -74,6 +74,8 @@ trillian.example.net.    3600 IN NS  ns.trillian.example.net.
 ns.trillian.example.net. 3600 IN A   $PREFIX.16
 ghost.example.net.       3600 IN NS  ns.ghost.example.net.
 ns.ghost.example.net.    3600 IN A   $PREFIX.17
+ford.example.net.        3600 IN NS  ns.ford.example.net.
+ns.ford.example.net.     3600 IN A   $PREFIX.12
 EOF
 
 mkdir $PREFIX.11
diff --git a/regression-tests.recursor/lame-noerror/command b/regression-tests.recursor/lame-noerror/command
new file mode 100755
index 0000000000..04e25b154e
--- /dev/null
+++ b/regression-tests.recursor/lame-noerror/command
@@ -0,0 +1,2 @@
+#!/bin/sh
+cleandig www.ford.example.net A | sed 's/\(.*\tIN\t[A-Z0-9]\+\t\)\([0-9]\+\)/\13600/'
diff --git a/regression-tests.recursor/lame-noerror/description b/regression-tests.recursor/lame-noerror/description
new file mode 100644
index 0000000000..51c0476a1b
--- /dev/null
+++ b/regression-tests.recursor/lame-noerror/description
@@ -0,0 +1 @@
+Correctly recognise a non-aa non-SOA NOERROR as lame.
diff --git a/regression-tests.recursor/lame-noerror/expected_result b/regression-tests.recursor/lame-noerror/expected_result
new file mode 100644
index 0000000000..c533c7fc7d
--- /dev/null
+++ b/regression-tests.recursor/lame-noerror/expected_result
@@ -0,0 +1,2 @@
+Rcode: 2, RD: 1, QR: 1, TC: 0, AA: 0, opcode: 0
+Reply to question for qname='www.ford.example.net.', qtype=A