From 216ca5a9f24ac601f9c56469bc08151553734657 Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Tue, 16 Aug 2016 09:32:14 -0400 Subject: [PATCH] Oops - fix a true/false reversal in the sysadm/users "userdelete" "clean_home" optional argument. --- src/server/WebBackend.cpp | 2 +- src/server/library/sysadm-beadm.cpp | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/server/WebBackend.cpp b/src/server/WebBackend.cpp index e8e1e6f..6d22613 100644 --- a/src/server/WebBackend.cpp +++ b/src/server/WebBackend.cpp @@ -931,7 +931,7 @@ RestOutputStruct::ExitCode WebSocket::EvaluateSysadmUserRequest(bool allaccess, QString deluser = in_args.toObject().value("name").toString(); if(deluser != user){ //cannot delete the currently-used user bool clean = true; - if(in_args.toObject().contains("clean_home")){ clean = (in_args.toObject().value("clean_home").toString().toLower() == "false"); } + if(in_args.toObject().contains("clean_home")){ clean = (in_args.toObject().value("clean_home").toString().toLower() != "false"); } ok = sysadm::UserManager::removeUser(deluser, clean); if(ok){ out->insert("result","success"); } else{ out->insert("error","Could not delete user"); } diff --git a/src/server/library/sysadm-beadm.cpp b/src/server/library/sysadm-beadm.cpp index 1afc66f..3a1893d 100644 --- a/src/server/library/sysadm-beadm.cpp +++ b/src/server/library/sysadm-beadm.cpp @@ -212,14 +212,14 @@ QJsonObject BEADM::listBEs() { // Unmount the given boot environment immediately. Confirmation should be done through the client. - QJsonObject BEADM::umountBE(QJsonObject jsin) { - QJsonObject retObject; +QJsonObject BEADM::umountBE(QJsonObject jsin) { + QJsonObject retObject; - QStringList keys = jsin.keys(); - if (! keys.contains("be") ) { - retObject.insert("error", "Missing required key(s) 'be'"); - return retObject; -} + QStringList keys = jsin.keys(); + if (! keys.contains("be") ) { + retObject.insert("error", "Missing required key(s) 'be'"); + return retObject; + } // Get the key values @@ -238,4 +238,4 @@ QJsonObject BEADM::listBEs() { retObject.insert("be", be); return retObject; - } \ No newline at end of file + }