From: bert hubert <bert.hubert@netherlabs.nl>
Date: Fri, 4 Apr 2014 05:42:16 +0000 (+0200)
Subject: improve case insensitivity of packetcache cleaning, plus silence coverity warning... 
X-Git-Tag: rec-3.6.0-rc1~85
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7679f7377b83e7eeadf120030a45b504bd6712ed;p=thirdparty%2Fpdns.git

improve case insensitivity of packetcache cleaning, plus silence coverity warning (possibly correct)
---

diff --git a/pdns/dns.cc b/pdns/dns.cc
index f726241bd4..34999b550a 100644
--- a/pdns/dns.cc
+++ b/pdns/dns.cc
@@ -101,7 +101,7 @@ bool dnspacketLessThan(const std::string& a, const std::string& b)
     int result=0;
     unsigned int n;
     for(n = 0; n < aLabelLen && n < bLabelLen; ++n) 
-      if((result = aSafe[aPos + n] - bSafe[bPos +n]))
+      if((result = aSafe[aPos + n] - bSafe[bPos +n]))   // XXX this should perhaps be dns_tolower
         break;
     // cerr<<"Done loop, result="<<result<<", n = "<<n<<", aLabelLen="<<aLabelLen<<", bLabelLen="<<bLabelLen<<endl;
     if(result < 0)
diff --git a/pdns/recpacketcache.cc b/pdns/recpacketcache.cc
index 6b3957587a..d5c3ac4126 100644
--- a/pdns/recpacketcache.cc
+++ b/pdns/recpacketcache.cc
@@ -15,10 +15,10 @@ RecursorPacketCache::RecursorPacketCache()
 int RecursorPacketCache::doWipePacketCache(const string& name, uint16_t qtype)
 {
   vector<uint8_t> packet;
-  DNSPacketWriter pw(packet, name, 0);
+  DNSPacketWriter pw(packet, toLower(name), 0);
   pw.getHeader()->rd=1;
   Entry e;
-  e.d_packet.assign(&*packet.begin(), &*packet.end());
+  e.d_packet.assign((const char*)&*packet.begin(), packet.size());
 
   // so the idea is, we search for a packet with qtype=0, which is ahead of anything with that name
 
@@ -29,7 +29,7 @@ int RecursorPacketCache::doWipePacketCache(const string& name, uint16_t qtype)
       break;
     uint16_t t;
     string found=questionExpand(iter->d_packet.c_str(), iter->d_packet.length(), t);
-    if(found != name) {
+    if(!pdns_iequals(found, name)) {  
       break;
     }
     if(t==qtype || qtype==0xffff) {