From bd1385d4766ee496bf87587dd40086ee3d510672 Mon Sep 17 00:00:00 2001 From: yuliyang Date: Tue, 31 Oct 2017 14:20:14 +0800 Subject: [PATCH] rgw: modify_s3_type_subuser_access_permissions_fail_through_admin_rest_api fix: http://tracker.ceph.com/issues/21983 Signed-off-by: yuliyang --- src/rgw/rgw_rest_user.cc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/rgw/rgw_rest_user.cc b/src/rgw/rgw_rest_user.cc index c8d8dd74265c8..906daa173d71d 100644 --- a/src/rgw/rgw_rest_user.cc +++ b/src/rgw/rgw_rest_user.cc @@ -418,8 +418,12 @@ void RGWOp_Subuser_Modify::execute() op_state.set_user_id(uid); op_state.set_subuser(subuser); - op_state.set_secret_key(secret_key); - op_state.set_gen_secret(); + + if (!secret_key.empty()) + op_state.set_secret_key(secret_key); + + if (gen_secret) + op_state.set_gen_secret(); if (!key_type_str.empty()) { if (key_type_str.compare("swift") == 0) -- 2.39.5