From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Wed, 14 Nov 2018 12:07:05 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into ixfrdist-limit-size
X-Git-Tag: auth-4.2.0-beta1~1^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4d9544215942632e190eb561a48be714ffe5ce64;p=thirdparty%2Fpdns.git

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

4d9544215942632e190eb561a48be714ffe5ce64
diff --cc pdns/ixfrdist.cc
index ee974fd864,bf7f43c897..48f26f0700
--- a/pdns/ixfrdist.cc
+++ b/pdns/ixfrdist.cc
@@@ -233,7 -234,8 +234,8 @@@ static void updateCurrentZoneInfo(cons
    g_soas[domain] = newInfo;
  }
  
 -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) {
+   setThreadName("ixfrdist/update");
    std::map<DNSName, time_t> lastCheck;
  
    // Initialize the serials we have