From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Fri, 28 Sep 2018 09:59:47 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into ixfrdist-limit-size
X-Git-Tag: auth-4.2.0-beta1~1^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=96990773a0181d8822e24c9ca97ff976cf1e77a0;p=thirdparty%2Fpdns.git

Merge remote-tracking branch 'origin/master' into ixfrdist-limit-size
---

96990773a0181d8822e24c9ca97ff976cf1e77a0
diff --cc pdns/ixfrdist.cc
index 8174a1c40d,8645e09114..ee974fd864
--- a/pdns/ixfrdist.cc
+++ b/pdns/ixfrdist.cc
@@@ -232,7 -233,7 +233,7 @@@ static void updateCurrentZoneInfo(cons
    g_soas[domain] = newInfo;
  }
  
- void updateThread(const string& workdir, const uint16_t& keep, const uint16_t& axfrTimeout, const uint32_t axfrMaxRecords) {
 -void updateThread(const string& workdir, const uint16_t& keep, const uint16_t& axfrTimeout, const uint16_t& soaRetry) {
++void updateThread(const string& workdir, const uint16_t& keep, const uint16_t& axfrTimeout, const uint16_t& soaRetry, const uint32_t axfrMaxRecords) {
    std::map<DNSName, time_t> lastCheck;
  
    // Initialize the serials we have
@@@ -1139,7 -1206,7 +1219,8 @@@ int main(int argc, char** argv) 
        config["work-dir"].as<string>(),
        config["keep"].as<uint16_t>(),
        config["axfr-timeout"].as<uint16_t>(),
 -      config["failed-soa-retry"].as<uint16_t>());
++      config["failed-soa-retry"].as<uint16_t>(),
 +      config["axfr-max-records"].as<uint32_t>());
  
    vector<std::thread> tcpHandlers;
    tcpHandlers.reserve(config["tcp-in-threads"].as<uint16_t>());