diff options
| author | blizzz <blizzz@owncloud.com> | 2013-01-31 09:24:45 -0800 |
|---|---|---|
| committer | blizzz <blizzz@owncloud.com> | 2013-01-31 09:24:45 -0800 |
| commit | 411e8e5218e0b0d6dc7e993f283b8a457f780af9 (patch) | |
| tree | 74479c7d0382a568dcee4a09ee1038df7706f4fb /apps/user_ldap/user_ldap.php | |
| parent | 5417e44b2a6d03042156e002264525091f66a6ad (diff) | |
| parent | afacaf8bc2b4c0aca0130b961df2f0e12408e5bc (diff) | |
| download | nextcloud-server-411e8e5218e0b0d6dc7e993f283b8a457f780af9.tar.gz nextcloud-server-411e8e5218e0b0d6dc7e993f283b8a457f780af9.zip | |
Merge pull request #1365 from owncloud/ldap_multiple_server
LDAP: support for multiple LDAP/AD servers
Diffstat (limited to 'apps/user_ldap/user_ldap.php')
| -rw-r--r-- | apps/user_ldap/user_ldap.php | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php index b3180e11358..6aa8cd9b83c 100644 --- a/apps/user_ldap/user_ldap.php +++ b/apps/user_ldap/user_ldap.php @@ -116,10 +116,9 @@ class USER_LDAP extends lib\Access implements \OCP\UserInterface { if($limit <= 0) { $limit = null; } - $search = empty($search) ? '*' : '*'.$search.'*'; $filter = $this->combineFilterWithAnd(array( $this->connection->ldapUserFilter, - $this->connection->ldapUserDisplayName.'='.$search + $this->getFilterPartForUserSearch($search) )); \OCP\Util::writeLog('user_ldap', 'getUsers: Options: search '.$search.' limit '.$limit.' offset '.$offset.' Filter: '.$filter, \OCP\Util::DEBUG); |