From: bert hubert <bert.hubert@netherlabs.nl>
Date: Wed, 8 Nov 2017 14:57:05 +0000 (+0100)
Subject: catch all exceptions coming from secpoll, this was a regression of this PR
X-Git-Tag: rec-4.0.8~1^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F6014%2Fhead;p=thirdparty%2Fpdns.git

catch all exceptions coming from secpoll, this was a regression of this PR

(cherry picked from commit 47e9b74f9ee097b9bdc029c21c9edfb2f7532102)
---

diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index bdbfd3c6c7..dbc1a9b53b 100644
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -2028,6 +2028,15 @@ static void houseKeeping(void *)
         {
           L<<Logger::Error<<"Exception while performing security poll: "<<e.what()<<endl;
         }
+        catch(PDNSException& e)
+        {
+          L<<Logger::Error<<"Exception while performing security poll: "<<e.reason<<endl;
+        }
+        catch(...)
+        {
+          L<<Logger::Error<<"Exception while performing security poll"<<endl;
+        }
+
       }
     }
     s_running=false;