summaryrefslogtreecommitdiffstats
path: root/apps/user_ldap/lib
diff options
context:
space:
mode:
authorAndreas Pflug <dev@admin4.org>2017-01-31 01:40:09 +0100
committerAndreas Pflug <dev@admin4.org>2017-01-31 01:40:09 +0100
commitb64e48335f63662a43d0b7198fd013d4af521996 (patch)
treeba0062635f5a2e50a0653ef7a5b46384e512ea5f /apps/user_ldap/lib
parentbbcb1dd2e0ce731753c4eecd7534ac9921aa7685 (diff)
downloadnextcloud-server-b64e48335f63662a43d0b7198fd013d4af521996.tar.gz
nextcloud-server-b64e48335f63662a43d0b7198fd013d4af521996.zip
Don't try to use memberof on posixgroups, since it doesn't support
memberUid attributes. Signed-off-by: Andreas Pflug <dev@admin4.org>
Diffstat (limited to 'apps/user_ldap/lib')
-rw-r--r--apps/user_ldap/lib/Group_LDAP.php4
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 49e5e724833..7ded4ef6635 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) {