From a5ee394c6a8183dfa7c2fdc2a993ca2c9a324be9 Mon Sep 17 00:00:00 2001
From: Otto <otto.moerbeek@open-xchange.com>
Date: Tue, 3 Aug 2021 09:08:09 +0200
Subject: [PATCH] Check in more places if the config policy has been updated
 before using or modifying it.

(cherry picked from commit 0c98e3de2cf1daae3f7034803668c1ac10fefe49)
---
 pdns/rpzloader.cc | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pdns/rpzloader.cc b/pdns/rpzloader.cc
index 6c87e7d91e..1d702f09cc 100644
--- a/pdns/rpzloader.cc
+++ b/pdns/rpzloader.cc
@@ -456,7 +456,15 @@ void RPZIXFRTracker(const std::vector<ComboAddress>& masters, boost::optional<DN
     try {
       g_log<<Logger::Info<<"Processing "<<deltas.size()<<" delta"<<addS(deltas)<<" for RPZ "<<zoneName<<endl;
 
+      if (luaconfsLocal->generation != configGeneration) {
+        g_log<<Logger::Info<<"A more recent configuration has been found, stopping the existing RPZ update thread for "<<zoneName<<endl;
+        return;
+      }
       oldZone = luaconfsLocal->dfe.getZone(zoneIdx);
+      if (!oldZone || oldZone->getDomain() != zoneName) {
+        g_log<<Logger::Info<<"This policy is no more, stopping the existing RPZ update thread for "<<zoneName << endl;
+        return;
+      }
       /* we need to make a _full copy_ of the zone we are going to work on */
       std::shared_ptr<DNSFilterEngine::Zone> newZone = std::make_shared<DNSFilterEngine::Zone>(*oldZone);
       /* initialize the current serial to the last one */
@@ -527,6 +535,10 @@ void RPZIXFRTracker(const std::vector<ComboAddress>& masters, boost::optional<DN
          but we don't want to touch anything else, especially other zones,
          since they might have been updated by another RPZ IXFR tracker thread.
       */
+      if (luaconfsLocal->generation != configGeneration) {
+        g_log<<Logger::Info<<"A more recent configuration has been found, stopping the existing RPZ update thread for "<<zoneName<<endl;
+        return;
+      }
       g_luaconfs.modify([zoneIdx, &newZone](LuaConfigItems& lci) {
                           lci.dfe.setZone(zoneIdx, newZone);
                         });
-- 
2.47.2