From: Yehuda Sadeh <yehuda@redhat.com>
Date: Sun, 13 Mar 2016 02:02:06 +0000 (-0800)
Subject: Merge pull request #7985 from linuxbox2/rgw-token-7
X-Git-Tag: v10.1.0~127
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e5c11f1854cd5f585c30bd59e5a44bb64a82c28e;p=ceph.git

Merge pull request #7985 from linuxbox2/rgw-token-7

rgw ldap (Matt Benjamin)

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
---

e5c11f1854cd5f585c30bd59e5a44bb64a82c28e
diff --cc src/rgw/rgw_lib.h
index be5add4564af,85a4c3164290..f418a6d19739
--- a/src/rgw/rgw_lib.h
+++ b/src/rgw/rgw_lib.h
@@@ -24,7 -26,9 +26,8 @@@ namespace rgw 
      RGWFrontendConfig* fec;
      RGWLibFrontend* fe;
      OpsLogSocket* olog;
+     rgw::LDAPHelper* ldh;
      RGWREST rest; // XXX needed for RGWProcessEnv
 -    RGWProcessEnv env;
      RGWRados* store;
  
    public: