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.8.0-beta2~5^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F12145%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 a92ee3f8b9..a528c25c2e 100644
--- a/pdns/rpzloader.cc
+++ b/pdns/rpzloader.cc
@@ -599,5 +599,9 @@ void RPZIXFRTracker(const std::vector<ComboAddress>& primaries, const boost::opt
       SLOG(g_log << Logger::Error << "Error while applying the update received over XFR for "<<zoneName<<", skipping the update: "<< e.what() <<endl,
            logger->error(Logr::Error, e.what(), "Exception while applying the update received over XFR, skipping", "exception", Logging::Loggable("std::exception")));
     }
+    catch (const PDNSException& e) {
+      SLOG(g_log << Logger::Error << "Error while applying the update received over XFR for "<<zoneName<<", skipping the update: "<< e.reason <<endl,
+           logger->error(Logr::Error, e.reason, "Exception while applying the update received over XFR, skipping", "exception", Logging::Loggable("PDNSException")));
+    }
   }
 }