From 84909cf5ccc6671a3af29c83207d03e751d0df87 Mon Sep 17 00:00:00 2001
From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Tue, 14 Jul 2015 10:55:15 +0200
Subject: [PATCH] DNSName: fix dnsdemog

---
 pdns/dnsdemog.cc | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/pdns/dnsdemog.cc b/pdns/dnsdemog.cc
index e5b72d02bc..e5d5f92315 100644
--- a/pdns/dnsdemog.cc
+++ b/pdns/dnsdemog.cc
@@ -55,18 +55,9 @@ try
           entry.port = pr.d_udp->uh_sport;
           entry.id=dh->id;
 
-          //          ecount[entry]++;
-          string::size_type pos = 0;
-          for(pos = 0; pos < mdp.d_qname.size() ; ++pos ) {
-            char c=mdp.d_qname[pos] ;
-            if(!isalnum(c) && c!='-' && c!='.')
-              break;
-          }
-          if(pos ==mdp.d_qname.size()) {
-            cout << "insert into dnsstats (source, port, id, query, qtype, tstampSec, tstampUsec, arcount) values ('" << entry.ip.toString() <<"', "<< ntohs(entry.port) <<", "<< ntohs(dh->id);
-            cout <<", '"<<mdp.d_qname<<"', "<<mdp.d_qtype<<", " << pr.d_pheader.ts.tv_sec <<", " << pr.d_pheader.ts.tv_usec;
-            cout <<", "<< ntohs(dh->arcount) <<");\n";
-          }
+          cout << "insert into dnsstats (source, port, id, query, qtype, tstampSec, tstampUsec, arcount) values ('" << entry.ip.toString() <<"', "<< ntohs(entry.port) <<", "<< ntohs(dh->id);
+          cout <<", '"<<mdp.d_qname.toString()<<"', "<<mdp.d_qtype<<", " << pr.d_pheader.ts.tv_sec <<", " << pr.d_pheader.ts.tv_usec;
+          cout <<", "<< ntohs(dh->arcount) <<");\n";
 
         }
         catch(MOADNSException& mde) {
-- 
2.47.3