From: Otto Date: Tue, 3 Aug 2021 07:08:09 +0000 (+0200) Subject: Check in more places if the config policy has been updated before X-Git-Tag: rec-4.5.6~10^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F10629%2Fhead;p=thirdparty%2Fpdns.git Check in more places if the config policy has been updated before using or modifying it. (cherry picked from commit 0c98e3de2cf1daae3f7034803668c1ac10fefe49) --- 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& masters, boost::optionalgeneration != configGeneration) { + g_log<dfe.getZone(zoneIdx); + if (!oldZone || oldZone->getDomain() != zoneName) { + g_log< newZone = std::make_shared(*oldZone); /* initialize the current serial to the last one */ @@ -527,6 +535,10 @@ void RPZIXFRTracker(const std::vector& masters, boost::optionalgeneration != configGeneration) { + g_log<