From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Wed, 16 May 2018 12:46:03 +0000 (+0200)
Subject: Backport #6469
X-Git-Tag: rec-4.1.3~4^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F6612%2Fhead;p=thirdparty%2Fpdns.git

Backport #6469
---

e4f7e5591bfbd295f91f54c990652f6d440a7e52
diff --cc pdns/rpzloader.cc
index 53d67a9796,e1342dbd85..78a3b3e53e
--- a/pdns/rpzloader.cc
+++ b/pdns/rpzloader.cc
@@@ -306,15 -296,11 +306,15 @@@ void RPZIXFRTracker(const ComboAddress
        if(refresh == 0) {
          refresh = sr->d_st.refresh;
        }
 -      zone->setSerial(sr->d_st.serial);
 -      setRPZZoneNewState(polName, sr->d_st.serial, zone->size(), true);
 +      newZone->setSerial(sr->d_st.serial);
 +      setRPZZoneNewState(polName, sr->d_st.serial, newZone->size(), true);
 +
 +      g_luaconfs.modify([zoneIdx, &newZone](LuaConfigItems& lci) {
 +        lci.dfe.setZone(zoneIdx, newZone);
 +      });
      }
      catch(const std::exception& e) {
-       theL()<<Logger::Warning<<"Unable to load RPZ zone '"<<zoneName<<"' from '"<<master<<"': '"<<e.what()<<"'. (Will try again in "<<refresh<<" seconds...)"<<endl;
+       theL()<<Logger::Warning<<"Unable to load RPZ zone '"<<zoneName<<"' from '"<<master<<"': '"<<e.what()<<"'. (Will try again in "<<(refresh > 0 ? refresh : 10)<<" seconds...)"<<endl;
        incRPZFailedTransfers(polName);
      }
      catch(const PDNSException& e) {