From 3f4d728767f3924b4b96b22e6ae312ba8decdfe9 Mon Sep 17 00:00:00 2001
From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Mon, 6 Jul 2020 15:55:53 +0200
Subject: [PATCH] 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.
---
 pdns/rpzloader.cc | 2 ++
 1 file changed, 2 insertions(+)

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) {
-- 
2.47.2