From: Casey Bodley <cbodley@users.noreply.github.com>
Date: Fri, 15 Oct 2021 18:01:58 +0000 (-0400)
Subject: Merge pull request #42208 from BryceCao/wip-add-return-when-access-key-exist-in-subus... 
X-Git-Tag: v17.1.0~667
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9cbf7eb5f250516dc9166e35cdf5800395c008b9;p=ceph.git

Merge pull request #42208 from BryceCao/wip-add-return-when-access-key-exist-in-subuser-create

rgw : add return when access key exist in subuser create

Reviewed-by: Casey Bodley <cbodley@redhat.com>
---

9cbf7eb5f250516dc9166e35cdf5800395c008b9
diff --cc src/rgw/rgw_user.h
index 5015e0d02e2f,b40abc6f19b4..acdb7a0afa05
--- a/src/rgw/rgw_user.h
+++ b/src/rgw/rgw_user.h
@@@ -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};