From bbc06e70b49b2917ee63985727cb92724fb99209 Mon Sep 17 00:00:00 2001 From: Orit Wasserman Date: Wed, 20 Jan 2016 17:24:38 +0100 Subject: [PATCH] rgw: fix subuser rm command failure Fixes: 14375 Signed-off-by: Orit Wasserman --- src/rgw/rgw_user.cc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/rgw/rgw_user.cc b/src/rgw/rgw_user.cc index 81b96bb203dc4..fb313d0071b48 100644 --- a/src/rgw/rgw_user.cc +++ b/src/rgw/rgw_user.cc @@ -1428,14 +1428,17 @@ int RGWSubUserPool::execute_remove(RGWUserAdminOpState& op_state, map::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; } // always purge all associate keys - user->keys.remove_subuser_keys(op_state, &subprocess_msg, defer_user_update); + user->keys.remove_subuser_keys(op_state, &subprocess_msg, true); // remove the subuser from the user info subuser_map->erase(siter); -- 2.39.5