From 6a6fb05ad81c519b4002ed1db00f3ed9b7bce6b4 Mon Sep 17 00:00:00 2001
From: bert hubert <bert.hubert@netherlabs.nl>
Date: Sat, 24 Jan 2015 21:07:58 +0100
Subject: [PATCH] As noted by Fusl, the new DoS measures kill our daemon in
 case the root refresh query times out.

---
 pdns/pdns_recursor.cc | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index 8f1af16227..0ae585a6c5 100644
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -1314,7 +1314,14 @@ try
     vector<DNSResourceRecord> ret;
 
     sr.setNoCache();
-    int res=sr.beginResolve(".", QType(QType::NS), 1, ret);
+    int res=-1;
+    try {
+      res=sr.beginResolve(".", QType(QType::NS), 1, ret);
+    }
+    catch(...)
+    {
+      L<<Logger::Error<<"Failed to update . records, got an exception"<<endl;
+    }
     if(!res) {
       L<<Logger::Notice<<"Refreshed . records"<<endl;
       last_rootupdate=now.tv_sec;
-- 
2.47.2