From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Thu, 17 Oct 2019 10:39:00 +0000 (+0200)
Subject: ixfrdist: if zonefile is broken, remove and find another
X-Git-Tag: rec-4.3.0-alpha2~11^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8b0f35eabcff32bda04874772749ab628bb54869;p=thirdparty%2Fpdns.git

ixfrdist: if zonefile is broken, remove and find another
---

diff --git a/pdns/ixfrdist.cc b/pdns/ixfrdist.cc
index c115b256f6..5a6fc54a70 100644
--- a/pdns/ixfrdist.cc
+++ b/pdns/ixfrdist.cc
@@ -282,6 +282,7 @@ void updateThread(const string& workdir, const uint16_t& keep, const uint16_t& a
     string dir = workdir + "/" + domain.toString();
     try {
       g_log<<Logger::Info<<"Trying to initially load domain "<<domain<<" from disk"<<endl;
+againserial:
       auto serial = getSerialFromDir(dir);
       shared_ptr<SOARecordContent> soa;
       uint32_t soaTTL;
@@ -290,8 +291,9 @@ void updateThread(const string& workdir, const uint16_t& keep, const uint16_t& a
         loadSOAFromDisk(domain, fname, soa, soaTTL);
         records_t records;
         if (soa == nullptr) {
-          g_log<<Logger::Error<<"Could not load SOA from disk for zone "<<domain<<", ignoring file"<<endl;
-          continue;
+          g_log<<Logger::Error<<"Could not load SOA from disk for zone "<<domain<<", removing file '"<<fname<<"'"<<endl;
+          unlink(fname.c_str());
+          goto againserial;
         }
         loadZoneFromDisk(records, fname, domain);
         auto zoneInfo = std::make_shared<ixfrinfo_t>();