diff options
| author | Casey Bodley <cbodley@users.noreply.github.com> | 2019-03-21 15:05:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-21 15:05:18 +0100 |
| commit | 9663480f3bd37a7094861b83a3857c6ca466e295 (patch) | |
| tree | 546074a0e04da36478f51b1cb8f0b9e10ee6157f | |
| parent | Merge pull request #27094 from tchaikov/wip-cmake-cmake-ubsan (diff) | |
| parent | rgw: fix minor compiler warning in keystone auth (diff) | |
| download | ceph-9663480f3bd37a7094861b83a3857c6ca466e295.tar.xz ceph-9663480f3bd37a7094861b83a3857c6ca466e295.zip | |
Merge pull request #27100 from ddiss/trivial_rgw_auth_keystone_gcc_warning
[trivial] rgw: fix minor compiler warning in keystone auth
Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
| -rw-r--r-- | src/rgw/rgw_auth_keystone.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rgw/rgw_auth_keystone.cc b/src/rgw/rgw_auth_keystone.cc index c98783cff9f..173c948251e 100644 --- a/src/rgw/rgw_auth_keystone.cc +++ b/src/rgw/rgw_auth_keystone.cc @@ -305,7 +305,7 @@ EC2Engine::get_from_keystone(const DoutPrefixProvider* dpp, const boost::string_ } const auto api_version = config.get_api_version(); - if (config.get_api_version() == rgw::keystone::ApiVersion::VER_3) { + if (api_version == rgw::keystone::ApiVersion::VER_3) { keystone_url.append("v3/s3tokens"); } else { keystone_url.append("v2.0/s3tokens"); @@ -394,7 +394,7 @@ std::pair<boost::optional<std::string>, int> EC2Engine::get_secret_from_keystone } const auto api_version = config.get_api_version(); - if (config.get_api_version() == rgw::keystone::ApiVersion::VER_3) { + if (api_version == rgw::keystone::ApiVersion::VER_3) { keystone_url.append("v3/"); } else { keystone_url.append("v2.0/"); |