diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2017-03-29 19:12:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-29 19:12:51 +0200 |
| commit | 636575e3de22f430f20867b14bcaaf1f50a91eac (patch) | |
| tree | 48139ba96c2620263827a79e12dde1f547f7271d /apps/user_ldap/lib/Group_LDAP.php | |
| parent | c1030a34a589a27e448a5f97d5e40e0459692a89 (diff) | |
| parent | 07b203d12ffda9c6a92e374272d5c188855520a3 (diff) | |
| download | nextcloud-server-636575e3de22f430f20867b14bcaaf1f50a91eac.tar.gz nextcloud-server-636575e3de22f430f20867b14bcaaf1f50a91eac.zip | |
Merge pull request #3329 from andreas-p/ldap_no-memberof-with-memberuid
Ldap no memberof with memberuid
Diffstat (limited to 'apps/user_ldap/lib/Group_LDAP.php')
| -rw-r--r-- | apps/user_ldap/lib/Group_LDAP.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/apps/user_ldap/lib/Group_LDAP.php b/apps/user_ldap/lib/Group_LDAP.php index d620a00f849..fb9920d3cc2 100644 --- a/apps/user_ldap/lib/Group_LDAP.php +++ b/apps/user_ldap/lib/Group_LDAP.php @@ -496,9 +496,11 @@ class Group_LDAP extends BackendUtility implements \OCP\GroupInterface { // if possible, read out membership via memberOf. It's far faster than // performing a search, which still is a fallback later. + // memberof doesn't support memberuid, so skip it here. if(intval($this->access->connection->hasMemberOfFilterSupport) === 1 && intval($this->access->connection->useMemberOfToDetectMembership) === 1 - ) { + && strtolower($this->access->connection->ldapGroupMemberAssocAttr) !== 'memberuid' + ) { $groupDNs = $this->_getGroupDNsFromMemberOf($userDN); if (is_array($groupDNs)) { foreach ($groupDNs as $dn) { |