From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Wed, 21 Feb 2018 16:37:02 +0000 (+0100)
Subject: rec: Ensure we don't hammer the RPZ master server
X-Git-Tag: dnsdist-1.3.0~88^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F6293%2Fhead;p=thirdparty%2Fpdns.git

rec: Ensure we don't hammer the RPZ master server

Before, if the `refresh` was not set in the lua-config file's
`rpzMaster` statement, we would keep trying to get delta's the whole
time. This commit ensures we update the zone's refresh config to the
value from the AXFR'd zone (if not set in the config).
---

diff --git a/pdns/reczones.cc b/pdns/reczones.cc
index b4c84a95fe..3198f80992 100644
--- a/pdns/reczones.cc
+++ b/pdns/reczones.cc
@@ -327,8 +327,8 @@ void RPZIXFRTracker(const ComboAddress& master, boost::optional<DNSFilterEngine:
   while (!sr) {
     try {
       sr=loadRPZFromServer(master, zoneName, zone, defpol, maxTTL, tt, maxReceivedBytes, localAddress);
-      if(refresh) {
-        sr->d_st.refresh=refresh;
+      if(refresh == 0) {
+        refresh = sr->d_st.refresh;
       }
       zone->setSerial(sr->d_st.serial);
     }
@@ -340,7 +340,11 @@ void RPZIXFRTracker(const ComboAddress& master, boost::optional<DNSFilterEngine:
     }
 
     if (!sr) {
-      sleep(refresh);
+      if (refresh == 0) {
+        sleep(10);
+      } else {
+        sleep(refresh);
+      }
     }
   }