summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorblizzz <blizzz@arthur-schiwon.de>2018-08-21 17:05:12 +0200
committerGitHub <noreply@github.com>2018-08-21 17:05:12 +0200
commit1a7516dd9346321668bd4a93f8f878ebf2d45ef3 (patch)
tree25d8742992346f0dff786a2c6bce4ad1cdec3cad
parenteba447987c7b531a6626d0639b9730de1d28b809 (diff)
parent3d8f174774315bd5c603e8d2234523f6ead2d3cc (diff)
downloadnextcloud-server-1a7516dd9346321668bd4a93f8f878ebf2d45ef3.tar.gz
nextcloud-server-1a7516dd9346321668bd4a93f8f878ebf2d45ef3.zip
Merge pull request #10775 from nextcloud/fix/10431/ldap-groups
Resolve all group memberships properly
-rw-r--r--apps/user_ldap/lib/Group_LDAP.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/user_ldap/lib/Group_LDAP.php b/apps/user_ldap/lib/Group_LDAP.php
index d9e2c7e2e3e..57f5faebd2c 100644
--- a/apps/user_ldap/lib/Group_LDAP.php
+++ b/apps/user_ldap/lib/Group_LDAP.php
@@ -825,7 +825,7 @@ class Group_LDAP extends BackendUtility implements \OCP\GroupInterface, IGroupLD
if($isMemberUid) {
//we got uids, need to get their DNs to 'translate' them to user names
$filter = $this->access->combineFilterWithAnd(array(
- str_replace('%uid', $member, $this->access->connection->ldapLoginFilter),
+ str_replace('%uid', trim($member), $this->access->connection->ldapLoginFilter),
$this->access->getFilterPartForUserSearch($search)
));
$ldap_users = $this->access->fetchListOfUsers($filter, $attrs, 1);