]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
rgw ldap: move conditional LDAPEngine init into it's ctor 26131/head
authorMatt Benjamin <mbenjamin@redhat.com>
Fri, 4 Jan 2019 21:25:16 +0000 (16:25 -0500)
committerPrashant D <pdhange@redhat.com>
Fri, 25 Jan 2019 01:01:09 +0000 (20:01 -0500)
commitd9fbba0e9abb45668ec92f71534246d4d4d736cb
tree56d960f8d5cff877a5117a9a881e61e02308ddf7
parent84d0554e371268c0d14a241cb5959ffe1d541e1e
rgw ldap:  move conditional LDAPEngine init into it's ctor

rgw::auth::ExternalAuthStrategy defines an LDAPEngine in a
ctor-initializer list, making it too late to conditionally initialize
-it- in ExternalAuthStrategy's ctor.

Fixes: https://tracker.ceph.com/issues/24228
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit 97e6c9dac7ca9050d7b16ac160120acbe6ddc33c)

Conflicts:
src/rgw/rgw_rest_s3.h : Added valid
src/rgw/rgw_auth_s3.h
src/rgw/rgw_rest_s3.cc
src/rgw/rgw_rest_s3.h