From: Your Name <peter.van.dijk@powerdns.com>
Date: Mon, 7 Dec 2020 17:45:33 +0000 (+0100)
Subject: pdnsutil edit-zone: do not exit on ZoneParser exception
X-Git-Tag: rec-4.5.0-alpha1~42^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F9826%2Fhead;p=thirdparty%2Fpdns.git

pdnsutil edit-zone: do not exit on ZoneParser exception
---

diff --git a/pdns/pdnsutil.cc b/pdns/pdnsutil.cc
index a8b1ffc577..99affedbcc 100644
--- a/pdns/pdnsutil.cc
+++ b/pdns/pdnsutil.cc
@@ -1063,6 +1063,12 @@ static int editZone(const DNSName &zone) {
     gotoline = fnum.second;
     goto reAsk;
   }
+  catch(PDNSException& e) {
+    cerr<<"Problem: "<<e.reason<<" "<<zpt.getLineOfFile()<<endl;
+    auto fnum = zpt.getLineNumAndFile();
+    gotoline = fnum.second;
+    goto reAsk;
+  }
 
   sort(post.begin(), post.end(), DNSRecord::prettyCompare);
   checkrr.clear();