Changeset 1081 for trunk/pdns/pdns/packethandler.cc

Timestamp:

08/11/07 15:52:53 (6 years ago)

Author:

ahu

Message:

potential fix for cname/wildcard issue

Files:

• trunk/pdns/pdns/packethandler.cc (modified) (4 diffs)

trunk/pdns/pdns/packethandler.cc

@@ -399 +399 @@
       }
     }
-    if(hits && !found && !rfound && shortcut ) // we found matching qnames but not a qtype
+    if(hits && !found && !rfound && shortcut ) { // we found matching qnames but not a qtype
+      DLOG(L<<"Found matching qname, but not the qtype"<<endl);
       return 2;
+    }
 
     if(rfound)
@@ -654 +656 @@
 
     if(mret==2) { // there is some data, but not of the correct type
+      r->clearRecords();
       DLOG(L<<"There is some data, but not of the correct type, adding SOA for NXRECORDSET"<<endl);
       SOAData sd;
@@ -696 +699 @@
       }
     }
-
     noSameLevelNS=true;
 
@@ -739 +741 @@
     // not found yet, try wildcards (we only try here in case of recursion - we should check before we hand off)
 
-    if(p->d.rd && d_doRecursion && d_doWildcards) { 
+    if(mret != 2 && p->d.rd && d_doRecursion && d_doWildcards) { 
       int res=doWildcardRecords(p,r,target);
       if(res) { // had a result