From: Orit Wasserman <owasserm@redhat.com>
Date: Wed, 20 Jan 2016 16:24:38 +0000 (+0100)
Subject: rgw: fix subuser rm command failure
X-Git-Tag: v0.94.8~34^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=850881cf787ccb23eca989861a6688f3a4de1a7c;p=ceph.git

rgw: fix subuser rm command failure

Fixes: 14375
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
(cherry picked from commit bbc06e70b49b2917ee63985727cb92724fb99209)

Conflicts:
	src/rgw/rgw_user.cc The "if (op_state.will_purge_keys())" block was
	later changed to "always purge all associated keys" by
	e7b7e1afc7a81c3f97976f7442fbdc5118b532b5 - keep the hammer version
---

diff --git a/src/rgw/rgw_user.cc b/src/rgw/rgw_user.cc
index 1e122df063b74..cf414e7717800 100644
--- a/src/rgw/rgw_user.cc
+++ b/src/rgw/rgw_user.cc
@@ -1284,7 +1284,10 @@ int RGWSubUserPool::execute_remove(RGWUserAdminOpState& op_state,
 
   map<std::string, RGWSubUser>::iterator siter;
   siter = subuser_map->find(subuser_str);
-
+  if (siter == subuser_map->end()){
+    set_err_msg(err_msg, "subuser not found: " + subuser_str);
+    return -EINVAL;
+  }
   if (!op_state.has_existing_subuser()) {
     set_err_msg(err_msg, "subuser not found: " + subuser_str);
     return -EINVAL;