sigh.. some queries have embedded nulls in them, which we log noisily

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

diff --git a/pdns/lwres.cc b/pdns/lwres.cc
index a70a77e77040bc3d7b6ed77304d3265ec596acbc..36ef4e1638e0b7e41de25373f16ef4b9dc80a268 100644 (file)
--- a/pdns/lwres.cc
+++ b/pdns/lwres.cc
@@ -141,9 +141,11 @@ LWRes::res_t LWRes::result()
     d_tcbit=mdp.d_header.tc;
     d_rcode=mdp.d_header.rcode;
 
-    if(strcasecmp(d_domain.c_str(), mdp.d_qname.c_str())) {
-      L<<Logger::Error<<"Packet purporting to come from remote server "<<U32ToIP(d_ip)<<" contained wrong answer: '" << d_domain << "' != '" << mdp.d_qname << "'" << endl;
-      g_stats.spoofedCount++;
+    if(strcasecmp(d_domain.c_str(), mdp.d_qname.c_str())) { 
+      if(d_domain.find((char)0)==string::npos) {// embedded nulls are too noisy
+       L<<Logger::Error<<"Packet purporting to come from remote server "<<U32ToIP(d_ip)<<" contained wrong answer: '" << d_domain << "' != '" << mdp.d_qname << "'" << endl;
+       g_stats.spoofedCount++;
+      }
       goto out;
     }
 

diff --git a/pdns/syncres.cc b/pdns/syncres.cc
index f3d22415b383760520c3a582688bbfcce1829781..f409e6b0d7e3e39507f85219ab130b9043c384f1 100644 (file)
--- a/pdns/syncres.cc
+++ b/pdns/syncres.cc
@@ -642,9 +642,9 @@ void SyncRes::addCruft(const string &qname, vector<DNSResourceRecord>& ret)
       set<GetBestNSAnswer>beenthere;
       if(k->qtype==QType(QType::MX)) {
        pair<string,string> prioServer=splitField(k->content,' ');
-         doResolve(prioServer.second, QType(QType::A), addit, 1, beenthere);
-         if(*l_doIPv6AP)
-           doResolve(prioServer.second, QType(QType::AAAA), addit, 1, beenthere);
+       doResolve(prioServer.second, QType(QType::A), addit, 1, beenthere);
+       if(*l_doIPv6AP)
+         doResolve(prioServer.second, QType(QType::AAAA), addit, 1, beenthere);
       }
       else {
        doResolve(k->content,QType(QType::A),addit,1,beenthere);