From f1ad3c5bc3187350d8345f793bcb59d10e9c7d27 Mon Sep 17 00:00:00 2001
From: Aki Tuomi <cmouse@desteem.org>
Date: Fri, 26 Sep 2014 14:24:58 +0300
Subject: [PATCH] Make sure we send servfail on error

---
 pdns/distributor.hh | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/pdns/distributor.hh b/pdns/distributor.hh
index 6235ec0f6..cf8e56d8b 100644
--- a/pdns/distributor.hh
+++ b/pdns/distributor.hh
@@ -218,7 +218,7 @@ template<class Answer, class Question, class Backend>void *MultiThreadDistributo
         us->d_overloaded=false;
       }
       
-      Answer *a;      
+      Answer *a; 
 
 #ifndef SMTPREDIR
       if(queuetimeout && q->d_dt.udiff()>queuetimeout*1000) {
@@ -235,12 +235,18 @@ template<class Answer, class Question, class Backend>void *MultiThreadDistributo
       catch(const PDNSException &e) {
         L<<Logger::Error<<"Backend error: "<<e.reason<<endl;
         delete b;
-        return 0;
+        a=q->replyPacket();
+        a->setRcode(RCode::ServFail);
+        S.inc("servfail-packets");
+        S.ringAccount("servfail-queries",q->qdomain);
       }
       catch(...) {
         L<<Logger::Error<<Logger::NTLog<<"Caught unknown exception in Distributor thread "<<(unsigned long)pthread_self()<<endl;
         delete b;
-        return 0;
+        a=q->replyPacket();
+        a->setRcode(RCode::ServFail);
+        S.inc("servfail-packets");
+        S.ringAccount("servfail-queries",q->qdomain);
       }
 
       AnswerData<Answer> AD;
@@ -270,13 +276,19 @@ template<class Answer, class Question, class Backend>int SingleThreadDistributor
     L<<Logger::Error<<"Backend error: "<<e.reason<<endl;
     delete b;
     b=new Backend;
-    return 0;
+    a=q->replyPacket();
+    a->setRcode(RCode::ServFail);
+    S.inc("servfail-packets");
+    S.ringAccount("servfail-queries",q->qdomain);
   }
   catch(...) {
     L<<Logger::Error<<Logger::NTLog<<"Caught unknown exception in Distributor thread "<<(unsigned long)pthread_self()<<endl;
     delete b;
     b=new Backend;
-    return 0;
+    a=q->replyPacket();
+    a->setRcode(RCode::ServFail);
+    S.inc("servfail-packets");
+    S.ringAccount("servfail-queries",q->qdomain);
   }
   AnswerData<Answer> AD;
   AD.A=a;
-- 
2.40.0