]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #42208 from BryceCao/wip-add-return-when-access-key-exist-in-subus...
authorCasey Bodley <cbodley@users.noreply.github.com>
Fri, 15 Oct 2021 18:01:58 +0000 (14:01 -0400)
committerGitHub <noreply@github.com>
Fri, 15 Oct 2021 18:01:58 +0000 (14:01 -0400)
rgw : add return when access key exist in subuser create

Reviewed-by: Casey Bodley <cbodley@redhat.com>
1  2 
src/rgw/rgw_user.cc
src/rgw/rgw_user.h

Simple merge
index 5015e0d02e2f5b01b1b3a6eac1ae92cd3eb30620,b40abc6f19b4d3bc1384ee4dbca38579a8cd379c..acdb7a0afa0522643ef6b06845ceb1e6737b7758
@@@ -121,8 -121,9 +121,9 @@@ struct RGWUserAdminOpState 
    std::string id; // access key
    std::string key; // secret key
    int32_t key_type{-1};
+   bool access_key_exist = false;
  
 -  std::set<string> mfa_ids;
 +  std::set<std::string> mfa_ids;
  
    // operation attributes
    bool existing_user{false};