From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Mon, 6 Jul 2020 13:55:53 +0000 (+0200)
Subject: When no rpz cache is used and no refresh time is specified, use
X-Git-Tag: rec-4.4.0-alpha2~15^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f4d728767f3924b4b96b22e6ae312ba8decdfe9;p=thirdparty%2Fpdns.git

When no rpz cache is used and no refresh time is specified, use
the refresh time read on the initial load of the zone.

Should fix #9299.
---

diff --git a/pdns/rpzloader.cc b/pdns/rpzloader.cc
index 80b4e00401..65ae7f5ceb 100644
--- a/pdns/rpzloader.cc
+++ b/pdns/rpzloader.cc
@@ -378,6 +378,8 @@ void RPZIXFRTracker(const std::vector<ComboAddress>& masters, boost::optional<DN
         sr = loadRPZFromServer(master, zoneName, newZone, defpol, defpolOverrideLocal, maxTTL, tt, maxReceivedBytes, localAddress, axfrTimeout);
         newZone->setSerial(sr->d_st.serial);
         newZone->setRefresh(sr->d_st.refresh);
+        // This period gets used below this loop
+        oldZone->setRefresh(sr->d_st.refresh);
         setRPZZoneNewState(polName, sr->d_st.serial, newZone->size(), true);
 
         g_luaconfs.modify([zoneIdx, &newZone](LuaConfigItems& lci) {