update sources to ceph Nautilus 14.2.1

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

diff --git a/ceph/src/rgw/rgw_ldap.h b/ceph/src/rgw/rgw_ldap.h
index ab84d82b41e5ec3089ab4b8478f6284a5dc3a0cd..aeb5f6134ed8edf22a7186422c4921148c07519a 100644 (file)
--- a/ceph/src/rgw/rgw_ldap.h
+++ b/ceph/src/rgw/rgw_ldap.h
@@ -38,7 +38,7 @@ namespace rgw {
     using lock_guard = std::lock_guard<std::mutex>;
 
     LDAPHelper(std::string _uri, std::string _binddn, std::string _bindpw,
-              std::string _searchdn, std::string _searchfilter, std::string _dnattr)
+              const std::string &_searchdn, const std::string &_searchfilter, const std::string &_dnattr)
       : uri(std::move(_uri)), binddn(std::move(_binddn)),
        bindpw(std::move(_bindpw)), searchdn(_searchdn), searchfilter(_searchfilter), dnattr(_dnattr),
        ldap(nullptr) {
@@ -91,7 +91,7 @@ namespace rgw {
       return ret; // OpenLDAP client error space
     }
 
-    int auth(const std::string uid, const std::string pwd);
+    int auth(const std::string &uid, const std::string &pwd);
 
     ~LDAPHelper() {
       if (ldap)
@@ -105,8 +105,8 @@ namespace rgw {
   class LDAPHelper
   {
   public:
-    LDAPHelper(std::string _uri, std::string _binddn, std::string _bindpw,
-              std::string _searchdn, std::string _searchfilter, std::string _dnattr)
+    LDAPHelper(const std::string &_uri, const std::string &_binddn, const std::string &_bindpw,
+              const std::string &_searchdn, const std::string &_searchfilter, const std::string &_dnattr)
       {}
 
     int init() {
@@ -117,7 +117,7 @@ namespace rgw {
       return -ENOTSUP;
     }
 
-    int auth(const std::string uid, const std::string pwd) {
+    int auth(const std::string &uid, const std::string &pwd) {
       return -EACCES;
     }
 
@@ -136,7 +136,7 @@ namespace rgw {
 #include "common/safe_io.h"
 #include <boost/algorithm/string.hpp>
 
-#include "include/assert.h"
+#include "include/ceph_assert.h"
 
 std::string parse_rgw_ldap_bindpw(CephContext* ctx);