summaryrefslogtreecommitdiffstats
path: root/apps/user_ldap/user_ldap.php
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2016-01-20 11:33:26 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2016-01-20 11:33:26 +0100
commitdd733d89256e0a2d1f7f4f96ac46b5a7bfbff984 (patch)
tree91538a65f378e461a5fb4317e246a382f8251b07 /apps/user_ldap/user_ldap.php
parent5652981600c4b93f627083fa174cf062ec177043 (diff)
parent1ed61328991ce1071fc956a18ea3159405b0e6f3 (diff)
downloadnextcloud-server-dd733d89256e0a2d1f7f4f96ac46b5a7bfbff984.tar.gz
nextcloud-server-dd733d89256e0a2d1f7f4f96ac46b5a7bfbff984.zip
Merge pull request #20804 from owncloud/fix-ldap-process-user-wo-displayname
LDAP: do not attempt to process user records without display name, fi…
Diffstat (limited to 'apps/user_ldap/user_ldap.php')
-rw-r--r--apps/user_ldap/user_ldap.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php
index 87c857a844a..65a4bbdda77 100644
--- a/apps/user_ldap/user_ldap.php
+++ b/apps/user_ldap/user_ldap.php
@@ -173,6 +173,7 @@ class USER_LDAP extends BackendUtility implements \OCP\IUserBackend, \OCP\UserIn
}
$filter = $this->access->combineFilterWithAnd(array(
$this->access->connection->ldapUserFilter,
+ $this->access->connection->ldapUserDisplayName . '=*',
$this->access->getFilterPartForUserSearch($search)
));