diff options
| author | Abhishek Lekshmanan <abhishek@suse.com> | 2019-08-27 16:13:43 +0200 |
|---|---|---|
| committer | Abhishek Lekshmanan <abhishek@suse.com> | 2020-02-03 17:53:30 +0100 |
| commit | 57baa840445a0027efa5667d1797160b38ecdcd2 (patch) | |
| tree | 2f9f00455a9562161e85cf8dba11b57bc405d142 /src/rgw | |
| parent | Merge pull request #32859 from liewegas/wip-cephadm-services (diff) | |
| download | ceph-57baa840445a0027efa5667d1797160b38ecdcd2.tar.xz ceph-57baa840445a0027efa5667d1797160b38ecdcd2.zip | |
rgw: acl: drop unused function & make get_group_perm const
Drop the unused RGWAccessControlPolicy::get_group_perm, make the ACL
get_group_perm as a const member function
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
Diffstat (limited to 'src/rgw')
| -rw-r--r-- | src/rgw/rgw_acl.cc | 2 | ||||
| -rw-r--r-- | src/rgw/rgw_acl.h | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/rgw/rgw_acl.cc b/src/rgw/rgw_acl.cc index 7f112cd9743..8a58cca0aaf 100644 --- a/src/rgw/rgw_acl.cc +++ b/src/rgw/rgw_acl.cc @@ -77,7 +77,7 @@ uint32_t RGWAccessControlList::get_perm(const DoutPrefixProvider* dpp, } uint32_t RGWAccessControlList::get_group_perm(ACLGroupTypeEnum group, - const uint32_t perm_mask) + const uint32_t perm_mask) const { ldout(cct, 5) << "Searching permissions for group=" << (int)group << " mask=" << perm_mask << dendl; diff --git a/src/rgw/rgw_acl.h b/src/rgw/rgw_acl.h index c08edda078c..2b9ff3694dc 100644 --- a/src/rgw/rgw_acl.h +++ b/src/rgw/rgw_acl.h @@ -306,7 +306,7 @@ public: uint32_t get_perm(const DoutPrefixProvider* dpp, const rgw::auth::Identity& auth_identity, uint32_t perm_mask); - uint32_t get_group_perm(ACLGroupTypeEnum group, uint32_t perm_mask); + uint32_t get_group_perm(ACLGroupTypeEnum group, uint32_t perm_mask) const; uint32_t get_referer_perm(uint32_t current_perm, std::string http_referer, uint32_t perm_mask); @@ -419,7 +419,6 @@ public: const rgw::auth::Identity& auth_identity, uint32_t perm_mask, const char * http_referer); - uint32_t get_group_perm(ACLGroupTypeEnum group, uint32_t perm_mask); bool verify_permission(const DoutPrefixProvider* dpp, const rgw::auth::Identity& auth_identity, uint32_t user_perm_mask, |