From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Mon, 10 Oct 2022 15:47:46 +0000 (+0200)
Subject: rec: Log invalid RPZ content when obtained via IXFR
X-Git-Tag: rec-4.5.12~3^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F12169%2Fhead;p=thirdparty%2Fpdns.git

rec: Log invalid RPZ content when obtained via IXFR

That kind of content was properly logged and handled when received
during the initial loading (AXFR) but not when received via an
incremental update.

(cherry picked from commit 55a99233728fc01e3946a97fb8dbb073a3003622)
---

diff --git a/pdns/rpzloader.cc b/pdns/rpzloader.cc
index 262c12091c..c5f4f10950 100644
--- a/pdns/rpzloader.cc
+++ b/pdns/rpzloader.cc
@@ -551,5 +551,8 @@ void RPZIXFRTracker(const std::vector<ComboAddress>& masters, boost::optional<DN
     catch (const std::exception& e) {
       g_log << Logger::Error << "Error while applying the update received over XFR for "<<zoneName<<", skipping the update: "<< e.what() <<endl;
     }
+    catch (const PDNSException& e) {
+      g_log << Logger::Error << "Error while applying the update received over XFR for "<<zoneName<<", skipping the update: "<< e.reason <<endl;
+    }
   }
 }