From: Kees Monshouwer <mind04@monshouwer.org>
Date: Tue, 23 Sep 2014 20:44:23 +0000 (+0200)
Subject: send empty SERVFAIL after a backend throws a DBException
X-Git-Tag: auth-3.4.0~20^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F1725%2Fhead;p=thirdparty%2Fpdns.git

send empty SERVFAIL after a backend throws a DBException
---

diff --git a/pdns/packethandler.cc b/pdns/packethandler.cc
index 5f7046d71f..e687bc8bb0 100644
--- a/pdns/packethandler.cc
+++ b/pdns/packethandler.cc
@@ -1317,6 +1317,8 @@ DNSPacket *PacketHandler::questionOrRecurse(DNSPacket *p, bool *shouldRecurse)
   }
   catch(DBException &e) {
     L<<Logger::Error<<"Backend reported condition which prevented lookup ("+e.reason+") sending out servfail"<<endl;
+    delete r;
+    r=p->replyPacket(); // generate an empty reply packet
     r->setRcode(RCode::ServFail);
     S.inc("servfail-packets");
     S.ringAccount("servfail-queries",p->qdomain);
@@ -1328,7 +1330,7 @@ DNSPacket *PacketHandler::questionOrRecurse(DNSPacket *p, bool *shouldRecurse)
   catch(std::exception &e) {
     L<<Logger::Error<<"Exception building answer packet ("<<e.what()<<") sending out servfail"<<endl;
     delete r;
-    r=p->replyPacket();  // generate an empty reply packet    
+    r=p->replyPacket(); // generate an empty reply packet
     r->setRcode(RCode::ServFail);
     S.inc("servfail-packets");
     S.ringAccount("servfail-queries",p->qdomain);