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

diff --cc docs/manpages/ixfrdist.yml.5.rst
Simple merge

diff --cc pdns/ixfrdist.cc
index 8174a1c40d8ef303310b82afd87894a8970d20cc,8645e091144098b7e5d4f0167c804cd9cf05a2cc..ee974fd8640ec53a14a1c7b4414a35c1a5da07e7
--- 1/pdns/ixfrdist.cc
--- 2/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>());

diff --cc pdns/ixfrdist.example.yml
Simple merge