From: yuliyang <yuliyang@cmss.chinamobile.com>
Date: Tue, 31 Oct 2017 06:20:14 +0000 (+0800)
Subject: rgw: modify_s3_type_subuser_access_permissions_fail_through_admin_rest_api
X-Git-Tag: v13.0.1~324^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F18641%2Fhead;p=ceph.git

rgw: modify_s3_type_subuser_access_permissions_fail_through_admin_rest_api

fix: http://tracker.ceph.com/issues/21983

Signed-off-by: yuliyang <yuliyang@cmss.chinamobile.com>
---

diff --git a/src/rgw/rgw_rest_user.cc b/src/rgw/rgw_rest_user.cc
index c8d8dd74265c..906daa173d71 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)