From e8b8e2021ea1239caa28b89d8024ae74412d7552 Mon Sep 17 00:00:00 2001 From: "Ruben S. Montero" Date: Wed, 23 May 2018 16:34:25 +0200 Subject: [PATCH] F #1377: Fix minor bugs --- src/authm/AuthManager.cc | 6 +++--- src/rm/RequestManagerClone.cc | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/authm/AuthManager.cc b/src/authm/AuthManager.cc index c712e4d4fa..3afa69d2d4 100644 --- a/src/authm/AuthManager.cc +++ b/src/authm/AuthManager.cc @@ -72,13 +72,13 @@ void AuthRequest::add_auth(Operation op, if ( uid == 0 || gids.count( GroupPool::ONEADMIN_ID ) == 1 ) { - lock = aclm->oneadmin_authorize(ob_perms, op); - auth = lock; + auth = aclm->oneadmin_authorize(ob_perms, op); + lock = true; } else { - lock = false; auth = aclm->authorize(uid, gids, ob_perms, op); + lock = false; } oss << auth; // Store the ACL authorization result in the request diff --git a/src/rm/RequestManagerClone.cc b/src/rm/RequestManagerClone.cc index 6b814b50c3..2152c396fd 100644 --- a/src/rm/RequestManagerClone.cc +++ b/src/rm/RequestManagerClone.cc @@ -203,10 +203,10 @@ Request::ErrorCode VMTemplateClone::clone(int source_id, const string &name, { NebulaLog::log("ReM",Log::ERROR,failure_message(ec,img_att)); - img_delete.request_execute(img_id, img_att); - att.resp_msg = "Failed to clone images: " + img_att.resp_msg; + img_delete.request_execute(new_img_id, img_att); + goto error_images; } }