From f7d5e99010085719e86c22d4cd930a7138d6aab3 Mon Sep 17 00:00:00 2001
From: Ken Moore <ken@ixsystems.com>
Date: Tue, 14 Feb 2017 09:46:36 -0500
Subject: [PATCH] API Change: Remove the sysadm/iocage "getdefaultsettings"
 action from the available API calls. This action is not longer supported by
 the newer version of iocage.

---
 src/server/WebBackend.cpp            | 34 ++++++++++++++--------------
 src/server/library/sysadm-iocage.cpp |  4 ++--
 src/server/library/sysadm-iocage.h   |  2 +-
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/server/WebBackend.cpp b/src/server/WebBackend.cpp
index 9626646..2b0b2ad 100644
--- a/src/server/WebBackend.cpp
+++ b/src/server/WebBackend.cpp
@@ -651,67 +651,67 @@ RestOutputStruct::ExitCode WebSocket::EvaluateSysadmIocageRequest(const QJsonVal
 	ok = true;
         out->insert("execjail", sysadm::Iocage::execJail(in_args.toObject()));
       }
-      if(act=="df"){
+      else if(act=="df"){
 	ok = true;
         out->insert("df", sysadm::Iocage::df());
       }
-      if(act=="destroyjail"){
+      else if(act=="destroyjail"){
 	ok = true;
         out->insert("destroyjail", sysadm::Iocage::destroyJail(in_args.toObject()));
       }
-      if(act=="createjail"){
+      else if(act=="createjail"){
 	ok = true;
         out->insert("createjail", sysadm::Iocage::createJail(in_args.toObject()));
       }
-      if(act=="clonejail"){
+      else if(act=="clonejail"){
 	ok = true;
         out->insert("clonejail", sysadm::Iocage::cloneJail(in_args.toObject()));
       }
-      if(act=="cleanall"){
+      else if(act=="cleanall"){
 	ok = true;
         out->insert("cleanall", sysadm::Iocage::cleanAll());
       }
-      if(act=="cleantemplates"){
+      else if(act=="cleantemplates"){
 	ok = true;
         out->insert("cleantemplates", sysadm::Iocage::cleanTemplates());
       }
-      if(act=="cleanreleases"){
+      else if(act=="cleanreleases"){
 	ok = true;
         out->insert("cleanreleases", sysadm::Iocage::cleanReleases());
       }
-      if(act=="cleanjails"){
+      else if(act=="cleanjails"){
 	ok = true;
         out->insert("cleanjails", sysadm::Iocage::cleanJails());
       }
-      if(act=="capjail"){
+      else if(act=="capjail"){
 	ok = true;
         out->insert("capjail", sysadm::Iocage::capJail(in_args.toObject()));
       }
-      if(act=="deactivatepool"){
+      else if(act=="deactivatepool"){
 	ok = true;
         out->insert("deactivatepool", sysadm::Iocage::deactivatePool(in_args.toObject()));
       }
-      if(act=="activatepool"){
+      else if(act=="activatepool"){
 	ok = true;
         out->insert("activatepool", sysadm::Iocage::activatePool(in_args.toObject()));
       }
-      if(act=="stopjail"){
+      else if(act=="stopjail"){
 	ok = true;
         out->insert("stopjail", sysadm::Iocage::stopJail(in_args.toObject()));
       }
-      if(act=="startjail"){
+      else if(act=="startjail"){
 	ok = true;
         out->insert("startjail", sysadm::Iocage::startJail(in_args.toObject()));
       }
-      if(act=="getdefaultsettings"){
+      /*if(act=="getdefaultsettings"){
 	ok = true;
         out->insert("getdefaultsettings", sysadm::Iocage::getDefaultSettings());
-      }
-      if(act=="getjailsettings"){
+      }*/
+      else if(act=="getjailsettings"){
 	ok = true;
         out->insert("getjailsettings", sysadm::Iocage::getJailSettings(in_args.toObject()));
       }
-      if(act=="listjails"){
+      else if(act=="listjails"){
 	ok = true;
         out->insert("listjails", sysadm::Iocage::listJails());
       }
diff --git a/src/server/library/sysadm-iocage.cpp b/src/server/library/sysadm-iocage.cpp
index e839634..c9af5ce 100644
--- a/src/server/library/sysadm-iocage.cpp
+++ b/src/server/library/sysadm-iocage.cpp
@@ -435,7 +435,7 @@ QJsonObject Iocage::startJail(QJsonObject jsin) {
 }
 
 // Return all the default iocage settings
-QJsonObject Iocage::getDefaultSettings() {
+/*QJsonObject Iocage::getDefaultSettings() {
   QJsonObject retObject;
 
   QStringList output = General::RunCommand("iocage defaults").split("\n");
@@ -457,7 +457,7 @@ QJsonObject Iocage::getDefaultSettings() {
 
   retObject.insert("defaults", vals);
   return retObject;
-}
+}*/
 
 // Return all of the jail settings
 QJsonObject Iocage::getJailSettings(QJsonObject jsin) {
diff --git a/src/server/library/sysadm-iocage.h b/src/server/library/sysadm-iocage.h
index 6eb59f0..60c6ee7 100644
--- a/src/server/library/sysadm-iocage.h
+++ b/src/server/library/sysadm-iocage.h
@@ -28,7 +28,7 @@ public:
 	static QJsonObject activatePool(QJsonObject);
 	static QJsonObject stopJail(QJsonObject);
 	static QJsonObject startJail(QJsonObject);
-	static QJsonObject getDefaultSettings();
+	//static QJsonObject getDefaultSettings();
 	static QJsonObject getJailSettings(QJsonObject);
 	static QJsonObject listJails();
 };