From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Fri, 16 Feb 2018 17:40:25 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into ixfrdist-timeout
X-Git-Tag: dnsdist-1.3.0~97^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ade5439dfd073b0e1896b7db8e6943c9722073dc;p=thirdparty%2Fpdns.git

Merge remote-tracking branch 'origin/master' into ixfrdist-timeout
---

ade5439dfd073b0e1896b7db8e6943c9722073dc
diff --cc pdns/ixfrdist.cc
index a581392c29,7f5ce2d833..619471cbd2
--- a/pdns/ixfrdist.cc
+++ b/pdns/ixfrdist.cc
@@@ -267,7 -272,12 +279,11 @@@ void updateThread() 
          if (g_verbose) {
            cerr<<"[INFO] Wrote zonedata for "<<domain<<" with serial "<<soa->d_st.serial<<" to "<<dir<<endl;
          }
+         {
+           std::lock_guard<std::mutex> guard(g_soas_mutex);
+           g_soas[domain] = soa;
+         }
 -
 -      } catch (ResolverException &e) {
 +      } catch (PDNSException &e) {
          cerr<<"[WARNING] Could not retrieve AXFR for '"<<domain<<"': "<<e.reason<<endl;
        } catch (runtime_error &e) {
          cerr<<"[WARNING] Could not save zone '"<<domain<<"' to disk: "<<e.what()<<endl;