From: Kees Monshouwer <mind04@monshouwer.org>
Date: Wed, 14 May 2014 18:16:58 +0000 (+0200)
Subject: pdnssec: fix segfault in list-all-zones without type
X-Git-Tag: rec-3.6.0-rc1~24^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=22c683482031599704972d5995fb80a380fbdd39;p=thirdparty%2Fpdns.git

pdnssec: fix segfault in list-all-zones without type
---

diff --git a/pdns/pdnssec.cc b/pdns/pdnssec.cc
index 7238e35639..f32c5058eb 100644
--- a/pdns/pdnssec.cc
+++ b/pdns/pdnssec.cc
@@ -640,7 +640,7 @@ int deleteZone(const string &zone) {
   return 1;
 }
 
-int listAllZones(const string &type) {
+int listAllZones(const string &type="") {
   scoped_ptr<UeberBackend> B(new UeberBackend("default"));
 
   vector<DomainInfo> domains;
@@ -654,6 +654,10 @@ int listAllZones(const string &type) {
       kindFilter = 1;
     else if (toUpper(type) == "NATIVE")
       kindFilter = 2;
+    else {
+      cerr<<"Syntax: pdnssec list-all-zones [master|slave|native]"<<endl;
+      return 1;
+    }
   }
 
   int count = 0;
@@ -1218,7 +1222,13 @@ try
     exit(checkAllZones(dk));
   }
   else if (cmds[0] == "list-all-zones") {
-    exit(listAllZones(cmds[1]));
+    if (cmds.size() > 2) {
+      cerr << "Syntax: pdnssec list-all-zones [master|slave|native]"<<endl;
+      return 0;
+    }
+    if (cmds.size() == 2)
+      return listAllZones(cmds[1]);
+    return listAllZones();
   }
   else if (cmds[0] == "test-zone") {
     cerr << "Did you mean check-zone?"<<endl;