Merge pull request #9961 from SUSE/wip-16190-hammer

hammer: subuser rm fails with status 125 Reviewed-by: Orit Wasserman <owasserm@redhat.com>
ceph · Jul 29, 2016 · 28107d3 · 28107d3
2 parents 5e1a57a + 850881c
commit 28107d3
Showing 1 changed file with 4 additions and 1 deletion.
diff --git 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;