From: bert hubert <bert.hubert@netherlabs.nl>
Date: Sat, 24 Jan 2015 20:07:58 +0000 (+0100)
Subject: As noted by Fusl, the new DoS measures kill our daemon in case the root refresh query... 
X-Git-Tag: rec-3.7.0-rc2~43
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6a6fb05ad81c519b4002ed1db00f3ed9b7bce6b4;p=thirdparty%2Fpdns.git

As noted by Fusl, the new DoS measures kill our daemon in case the root refresh query times out.
---

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;