snap; testrunner compiles but fails miserably

diff --git a/pdns/nameserver.cc b/pdns/nameserver.cc
index 7cd2e4a0c658f61ee13c22730c4610268efd53f9..6a6819392ff110d2bc5d08751533c1b7eee7c8d7 100644 (file)
--- a/pdns/nameserver.cc
+++ b/pdns/nameserver.cc
@@ -294,9 +294,9 @@ void UDPNameserver::send(DNSPacket *p)
   /* Query statistics */
   if(p->d.aa) {
     if (p->d.rcode==RCode::NXDomain)
-      S.ringAccount("nxdomain-queries",p->qdomain+"/"+p->qtype.getName());
+      S.ringAccount("nxdomain-queries",p->qdomain.toString()+"/"+p->qtype.getName());
   } else if (p->isEmpty()) {
-    S.ringAccount("unauth-queries",p->qdomain+"/"+p->qtype.getName());
+    S.ringAccount("unauth-queries",p->qdomain.toString()+"/"+p->qtype.getName());
     S.ringAccount("remotes-unauth",p->d_remote);
   }
 

diff --git a/pdns/test-packetcache_cc.cc b/pdns/test-packetcache_cc.cc
index fd1144d1e9e19bb85a7ad61e1f429bd99fcb4f24..a0b495be2b82ec6f2fa8c1b84ea95876ad0c67f4 100644 (file)
--- a/pdns/test-packetcache_cc.cc
+++ b/pdns/test-packetcache_cc.cc
@@ -15,6 +15,11 @@
 extern StatBag S;
 
 
+std::ostream & operator<<(std::ostream &os, const DNSName& d)
+{
+    return os <<"DNSName("<<d.toString()<<")";
+}
+
 BOOST_AUTO_TEST_SUITE(packetcache_cc)
 
 BOOST_AUTO_TEST_CASE(test_PacketCacheSimple) {