send empty SERVFAIL on exeeded retargetcount and log failures

diff --git a/pdns/packethandler.cc b/pdns/packethandler.cc
index 3ce671e934528748a987da8f5f328b3f95b8f299..674ac53c19fbeae281f9cae3204d5167f3f26a8a 100644 (file)
--- a/pdns/packethandler.cc
+++ b/pdns/packethandler.cc
@@ -1206,6 +1206,9 @@ DNSPacket *PacketHandler::questionOrRecurse(DNSPacket *p, bool *shouldRecurse)
 
   retargeted:;
     if(retargetcount > 10) {    // XXX FIXME, retargetcount++?
+      L<<Logger::Warning<<"Abort CNAME chain resolution after "<<--retargetcount<<" redirects, sending out servfail. Initial query: '"<<p->qdomain<<"'"<<endl;
+      delete r;
+      r=p->replyPacket();
       r->setRcode(RCode::ServFail);
       return r;
     }