From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Thu, 22 Feb 2018 11:56:03 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into rec-axfr-timeout
X-Git-Tag: dnsdist-1.3.0~83^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F6290%2Fhead;p=thirdparty%2Fpdns.git

Merge remote-tracking branch 'origin/master' into rec-axfr-timeout
---

8a5d7dd601a78dd2035497d367c8ec9f197303e3
diff --cc pdns/reczones.cc
index 50e489efc1,3198f80992..60ef9c87a1
--- a/pdns/reczones.cc
+++ b/pdns/reczones.cc
@@@ -326,9 -326,9 +326,9 @@@ void RPZIXFRTracker(const ComboAddress
  
    while (!sr) {
      try {
-       sr = loadRPZFromServer(master, zoneName, zone, defpol, maxTTL, tt, maxReceivedBytes, localAddress, axfrTimeout);
-       if(refresh) {
-         sr->d_st.refresh=refresh;
 -      sr=loadRPZFromServer(master, zoneName, zone, defpol, maxTTL, tt, maxReceivedBytes, localAddress);
++      sr=loadRPZFromServer(master, zoneName, zone, defpol, maxTTL, tt, maxReceivedBytes, localAddress, axfrTimeout);
+       if(refresh == 0) {
+         refresh = sr->d_st.refresh;
        }
        zone->setSerial(sr->d_st.serial);
      }