diff options
| author | Yuval Lifshitz <yuvalif@yahoo.com> | 2019-07-08 22:00:06 +0200 |
|---|---|---|
| committer | Yuval Lifshitz <yuvalif@yahoo.com> | 2019-09-10 17:54:05 +0200 |
| commit | a14353496d1f75a303495f538141a1a54ff28c60 (patch) | |
| tree | cc35f088d54c2cea5a1c7d37c618285f218d30d9 /src/rgw/rgw_swift_auth.h | |
| parent | Merge pull request #30287 from tchaikov/wip-run-cbt (diff) | |
| download | ceph-a14353496d1f75a303495f538141a1a54ff28c60.tar.xz ceph-a14353496d1f75a303495f538141a1a54ff28c60.zip | |
rgw/pubsub: allow pubsub REST API on master
Signed-off-by: Yuval Lifshitz <yuvalif@yahoo.com>
Diffstat (limited to 'src/rgw/rgw_swift_auth.h')
| -rw-r--r-- | src/rgw/rgw_swift_auth.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rgw/rgw_swift_auth.h b/src/rgw/rgw_swift_auth.h index 8ec6a4da8a1..6270ee67599 100644 --- a/src/rgw/rgw_swift_auth.h +++ b/src/rgw/rgw_swift_auth.h @@ -196,7 +196,7 @@ class DefaultStrategy : public rgw::auth::Strategy, acl_strategy_t&& extra_acl_strategy, const rgw::auth::RemoteApplier::AuthInfo &info) const override { auto apl = \ - rgw::auth::add_3rdparty(ctl, s->account_name, + rgw::auth::add_3rdparty(ctl, rgw_user(s->account_name), rgw::auth::add_sysreq(cct, ctl, s, rgw::auth::RemoteApplier(cct, ctl, std::move(extra_acl_strategy), info, implicit_tenant_context, @@ -211,7 +211,7 @@ class DefaultStrategy : public rgw::auth::Strategy, const std::string& subuser, const boost::optional<uint32_t>& perm_mask) const override { auto apl = \ - rgw::auth::add_3rdparty(ctl, s->account_name, + rgw::auth::add_3rdparty(ctl, rgw_user(s->account_name), rgw::auth::add_sysreq(cct, ctl, s, rgw::auth::LocalApplier(cct, user_info, subuser, perm_mask))); /* TODO(rzarzynski): replace with static_ptr. */ |