update ceph source to reef 18.1.2

[ceph.git] / ceph / src / rgw / rgw_rest_iam.h

diff --git a/ceph/src/rgw/rgw_rest_iam.h b/ceph/src/rgw/rgw_rest_iam.h
index d2421b603210a9b894f78f661a9ab5bbe262426b..3e579ab35ce767521e61f533d1fd66479ef3066f 100644 (file)
--- a/ceph/src/rgw/rgw_rest_iam.h
+++ b/ceph/src/rgw/rgw_rest_iam.h
@@ -11,10 +11,10 @@ class RGWHandler_REST_IAM : public RGWHandler_REST {
   const rgw::auth::StrategyRegistry& auth_registry;
   bufferlist bl_post_body;
   RGWOp *op_post() override;
-  void rgw_iam_parse_input();
+
 public:
 
-  static int init_from_header(struct req_state *s, int default_formatter, bool configurable_format);
+  static bool action_exists(const req_state* s);
 
   RGWHandler_REST_IAM(const rgw::auth::StrategyRegistry& auth_registry,
                      bufferlist& bl_post_body)
@@ -23,8 +23,8 @@ public:
       bl_post_body(bl_post_body) {}
   ~RGWHandler_REST_IAM() override = default;
 
-  int init(rgw::sal::Store* store,
-           struct req_state *s,
+  int init(rgw::sal::Driver* driver,
+           req_state *s,
            rgw::io::BasicClient *cio) override;
   int authorize(const DoutPrefixProvider* dpp, optional_yield y) override;
   int postauth_init(optional_yield y) override { return 0; }
@@ -35,14 +35,14 @@ public:
   RGWRESTMgr_IAM() = default;
   ~RGWRESTMgr_IAM() override = default;
 
-  RGWRESTMgr *get_resource_mgr(struct req_state* const s,
+  RGWRESTMgr *get_resource_mgr(req_state* const s,
                                const std::string& uri,
                                std::string* const out_uri) override {
     return this;
   }
 
-  RGWHandler_REST* get_handler(rgw::sal::Store* store,
-                              struct req_state*,
+  RGWHandler_REST* get_handler(rgw::sal::Driver* driver,
+                              req_state*,
                                const rgw::auth::StrategyRegistry&,
                                const std::string&) override;
 };