Changeset 1147

Timestamp:

03/01/08 23:11:26 (5 years ago)

Author:

ahu

Message:

fix cname-and-wildcard with qname but no rrcode match, reported by zzyzz

Files:

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

trunk/pdns/pdns/packethandler.cc

@@ -1 @@
- /*
+/*
     PowerDNS Versatile Database Driven Nameserver
-    Copyright (C) 2002-2007  PowerDNS.COM BV
+    Copyright (C) 2002-2008  PowerDNS.COM BV
 
     This program is free software; you can redistribute it and/or modify
@@ -34 +34 @@
 #include "dnsproxy.hh"
 
+
 extern StatBag S;
 extern PacketCache PC;  
@@ -264 +265 @@
   string subdomain=target;
   string::size_type pos;
+
   while((pos=subdomain.find("."))!=string::npos) {
     subdomain=subdomain.substr(pos+1);
@@ -305 +307 @@
     }
     if(found) {
-      DLOG(L<<"Wildcard match on '"<<string("*.")+subdomain<<"'"<<endl);
+      DLOG(L<<"Wildcard match on '"<<string("*.")+subdomain<<"'"<<", retargeted="<<retargeted<<endl);
       return retargeted ? 2 : 1;
     }
   }
+  DLOG(L<<"Returning no hit for '"<<string("*.")+subdomain<<"'"<<endl);
   return 0;
 }
@@ -385 +388 @@
     bool shortcut=p->qtype.getCode()!=QType::SOA && p->qtype.getCode()!=QType::ANY;
     int hits=0;
+    bool relevantNS=false;
 
     while(B.get(rr)) {
+      if(rr.qtype.getCode() == QType::NS && p->qtype.getCode() != QType::NS) { // possible retargeting
+        relevantNS=true;
+      }
       if(rr.qtype.getCode()!=QType::NS || p->qtype.getCode()==QType::NS)
         hits++;
@@ -399 +406 @@
       }
     }
-    if(hits && !found && !rfound && shortcut ) { // we found matching qnames but not a qtype
+    if(hits && !relevantNS && !found && !rfound && shortcut ) { // we found matching qnames but not a qtype
       DLOG(L<<"Found matching qname, but not the qtype"<<endl);
       return 2;
@@ -681 +688 @@
         rr.d_place=DNSResourceRecord::AUTHORITY;
         r->addRecord(rr);
+        if(mret == 2)
+          goto sendit;
       }
     }