From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Wed, 24 Feb 2016 16:35:22 +0000 (+0100)
Subject: recursor: catch exception during IXFR of RPZ
X-Git-Tag: auth-4.0.0-alpha2~7^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F3442%2Fhead;p=thirdparty%2Fpdns.git

recursor: catch exception during IXFR of RPZ

This would lead to a SIGABRT before when the IXFR failed.
---

diff --git a/pdns/reczones.cc b/pdns/reczones.cc
index 698aecf5c6..8b99e23ec7 100644
--- a/pdns/reczones.cc
+++ b/pdns/reczones.cc
@@ -327,8 +327,13 @@ void RPZIXFRTracker(const ComboAddress& master, const DNSName& zone, const TSIGT
     sleep(refresh);
     
     L<<Logger::Info<<"Getting IXFR deltas for "<<zone<<" from "<<master.toStringWithPort()<<", our serial: "<<std::dynamic_pointer_cast<SOARecordContent>(dr.d_content)->d_st.serial<<endl;
-
-    auto deltas = getIXFRDeltas(master, zone, dr, tt);
+    vector<pair<vector<DNSRecord>, vector<DNSRecord> > > deltas;
+    try {
+      deltas = getIXFRDeltas(master, zone, dr, tt);
+    } catch(std::runtime_error& e ){
+      L<<Logger::Warning<<e.what()<<endl;
+      continue;
+    }
     if(deltas.empty())
       continue;
     L<<Logger::Info<<"Processing "<<deltas.size()<<" delta"<<addS(deltas)<<" for RPZ "<<zone<<endl;