import 15.2.0 Octopus source

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

diff --git a/ceph/src/rgw/rgw_auth_registry.h b/ceph/src/rgw/rgw_auth_registry.h
index 9316e8ec4ebd8ab09de5a70685f14137f2049699..a38cb7d6c6d4acdc25b5829d17825cc2fc34425d 100644 (file)
--- a/ceph/src/rgw/rgw_auth_registry.h
+++ b/ceph/src/rgw/rgw_auth_registry.h
@@ -1,5 +1,5 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
-// vim: ts=8 sw=2 smarttab
+// vim: ts=8 sw=2 smarttab ft=cpp
 
 
 #ifndef CEPH_RGW_AUTH_REGISTRY_H
@@ -36,9 +36,11 @@ class StrategyRegistry {
     s3_main_strategy_plain_t s3_main_strategy_plain;
     s3_main_strategy_boto2_t s3_main_strategy_boto2;
 
-    s3_main_strategy_t(CephContext* const cct, RGWRados* const store)
-      : s3_main_strategy_plain(cct, store),
-        s3_main_strategy_boto2(cct, store) {
+    s3_main_strategy_t(CephContext* const cct,
+                      ImplicitTenants& implicit_tenant_context,
+                      RGWCtl* const ctl)
+      : s3_main_strategy_plain(cct, implicit_tenant_context, ctl),
+        s3_main_strategy_boto2(cct, implicit_tenant_context, ctl) {
       add_engine(Strategy::Control::SUFFICIENT, s3_main_strategy_plain);
       add_engine(Strategy::Control::FALLBACK, s3_main_strategy_boto2);
     }
@@ -58,11 +60,12 @@ class StrategyRegistry {
 
 public:
   StrategyRegistry(CephContext* const cct,
-                   RGWRados* const store)
-    : s3_main_strategy(cct, store),
-      s3_post_strategy(cct, store),
-      swift_strategy(cct, store),
-      sts_strategy(cct, store) {
+                   ImplicitTenants& implicit_tenant_context,
+                   RGWCtl* const ctl)
+    : s3_main_strategy(cct, implicit_tenant_context, ctl),
+      s3_post_strategy(cct, implicit_tenant_context, ctl),
+      swift_strategy(cct, implicit_tenant_context, ctl),
+      sts_strategy(cct, implicit_tenant_context, ctl) {
   }
 
   const s3_main_strategy_t& get_s3_main() const {
@@ -83,8 +86,9 @@ public:
 
   static std::shared_ptr<StrategyRegistry>
   create(CephContext* const cct,
-         RGWRados* const store) {
-    return std::make_shared<StrategyRegistry>(cct, store);
+         ImplicitTenants& implicit_tenant_context,
+         RGWCtl* const ctl) {
+    return std::make_shared<StrategyRegistry>(cct, implicit_tenant_context, ctl);
   }
 };