From: bert hubert <bert.hubert@netherlabs.nl>
Date: Tue, 5 Feb 2019 16:38:31 +0000 (+0100)
Subject: expand pdnsutil load-zone so it can load multiple zone/filename pairs in one go
X-Git-Tag: auth-4.2.0-beta1~37^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d24632fe2a9741e66056ed66737bd29aa39ed0c9;p=thirdparty%2Fpdns.git

expand pdnsutil load-zone so it can load multiple zone/filename pairs in one go
---

diff --git a/pdns/pdnsutil.cc b/pdns/pdnsutil.cc
index 46cde8ac62..9775b42a8f 100644
--- a/pdns/pdnsutil.cc
+++ b/pdns/pdnsutil.cc
@@ -2363,14 +2363,16 @@ try
     exit(listKeys(zname, dk));
   }
   else if(cmds[0] == "load-zone") {
-    if(cmds.size() != 3) {
-      cerr<<"Syntax: pdnsutil load-zone ZONE FILENAME"<<endl;
+    if(cmds.size() < 3) {
+      cerr<<"Syntax: pdnsutil load-zone ZONE FILENAME [ZONE FILENAME] .."<<endl;
       return 0;
     }
     if(cmds[1]==".")
       cmds[1].clear();
 
-    exit(loadZone(DNSName(cmds[1]), cmds[2]));
+    for(int n=1; n + 2 <= cmds.size(); n+=2)
+      loadZone(DNSName(cmds[n]), cmds[n+1]);
+    return 0;
   }
   else if(cmds[0] == "secure-zone") {
     if(cmds.size() < 2) {