From: Abhishek Lekshmanan <abhishek@suse.com>
Date: Thu, 15 Oct 2020 15:52:20 +0000 (+0200)
Subject: rgw: role fixes
X-Git-Tag: v18.0.0~710^2~32
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=feb4754e827d8368794fa0c3e9ecb3c1b0088191;p=ceph.git

rgw: role fixes

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
---

diff --git a/src/rgw/services/svc_role_rados.cc b/src/rgw/services/svc_role_rados.cc
index 62a9d6a13156..bd5461b8ab53 100644
--- a/src/rgw/services/svc_role_rados.cc
+++ b/src/rgw/services/svc_role_rados.cc
@@ -9,7 +9,6 @@
 
 class RGWSI_Role_Module : public RGWSI_MBSObj_Handler_Module {
   RGWSI_Role_RADOS::Svc& svc;
-  std::string prefix;
 public:
   RGWSI_Role_Module(RGWSI_Role_RADOS::Svc& _svc): RGWSI_MBSObj_Handler_Module("Role"),
                                                   svc(_svc) {}
@@ -28,8 +27,7 @@ public:
   }
 
   bool is_valid_oid(const std::string& oid) override {
-    return !boost::algorithm::starts_with(oid, role_name_oid_prefix) ||
-      !boost::algorithm::starts_with(oid, role_path_oid_prefix);
+    return boost::algorithm::starts_with(oid, role_oid_prefix);
   }
 
   std::string key_to_oid(const std::string& key) override {
@@ -41,7 +39,7 @@ public:
   }
 
   const std::string& get_oid_prefix() {
-    return prefix;
+    return role_oid_prefix;
   }
 };