From: Christian Hofstaedtler <christian@hofstaedtler.name>
Date: Mon, 23 Nov 2015 11:46:21 +0000 (+0100)
Subject: Fix ANY under DLOG
X-Git-Tag: dnsdist-1.0.0-alpha1~208^2~1^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F2922%2Fhead;p=thirdparty%2Fpdns.git

Fix ANY under DLOG

Previously, unit tests would produce:

After first ANY query for 'aland.test.com.', id=10: weDone=1, weHaveUnauth=0, weRedirected=0, haveAlias='Exception building answer packet (Attempt to print an unset dnsname) sending out servfail
---

diff --git a/pdns/packethandler.cc b/pdns/packethandler.cc
index de2d85341c..7dd2d9a6e3 100644
--- a/pdns/packethandler.cc
+++ b/pdns/packethandler.cc
@@ -1375,7 +1375,7 @@ DNSPacket *PacketHandler::questionOrRecurse(DNSPacket *p, bool *shouldRecurse)
     }
 
 
-    DLOG(L<<"After first ANY query for '"<<target<<"', id="<<sd.domain_id<<": weDone="<<weDone<<", weHaveUnauth="<<weHaveUnauth<<", weRedirected="<<weRedirected<<", haveAlias='"<<haveAlias<<"'"<<endl);
+    DLOG(L<<"After first ANY query for '"<<target<<"', id="<<sd.domain_id<<": weDone="<<weDone<<", weHaveUnauth="<<weHaveUnauth<<", weRedirected="<<weRedirected<<", haveAlias='"<<(haveAlias.empty() ? "(none)" : haveAlias.toString())<<"'"<<endl);
     if(p->qtype.getCode() == QType::DS && weHaveUnauth &&  !weDone && !weRedirected && d_dk.isSecuredZone(sd.qname)) {
       DLOG(L<<"Q for DS of a name for which we do have NS, but for which we don't have on a zone with DNSSEC need to provide an AUTH answer that proves we don't"<<endl);
       makeNOError(p, r, target, DNSName(), sd, 1);