fix Frank Altpeter's discovery that delegations don't work well in non-DNSSEC mode...

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

diff --git a/pdns/packethandler.cc b/pdns/packethandler.cc
index 59e96f4dacd0bf9e0d4de327e6889eb5b07317a8..472c97c5c71c8f739bbbc0bada93289ccf738b17 100644 (file)
--- a/pdns/packethandler.cc
+++ b/pdns/packethandler.cc
@@ -1274,7 +1274,7 @@ DNSPacket *PacketHandler::questionOrRecurse(DNSPacket *p, bool *shouldRecurse)
     while(B.get(rr)) {
       if((p->qtype.getCode() == QType::ANY || rr.qtype == p->qtype) && rr.auth) 
         weDone=1;
-      if((rr.qtype == p->qtype || rr.qtype.getCode() == QType::NS) && !rr.auth) 
+      if((rr.qtype == p->qtype && !rr.auth) || rr.qtype.getCode() == QType::NS) 
         weHaveUnauth=1;
 
       if(rr.qtype.getCode() == QType::CNAME && p->qtype.getCode() != QType::CNAME) 
@@ -1286,7 +1286,7 @@ DNSPacket *PacketHandler::questionOrRecurse(DNSPacket *p, bool *shouldRecurse)
 
     if(rrset.empty()) {
       // try wildcards, and if they don't work, go look for NS records
-      cerr<<"Found nothing in the ANY, but let's try wildcards.."<<endl;
+      DLOG(L<<Logger::Warning<<"Found nothing in the ANY, but let's try wildcards.."<<endl);
       bool wereRetargeted(false), nodata(false);
       if(tryWildcard(p, r, sd, target, wereRetargeted, nodata)) {
         if(wereRetargeted) {