summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2018-03-16 14:25:01 +0100
committerGitHub <noreply@github.com>2018-03-16 14:25:01 +0100
commit0c501a89db8b23b45d88dbac2159c1f3e6ac47e6 (patch)
tree23965c61a01bd3059d904909727713f7075d0b9a /apps
parente8dbfc1b08a07fed37ffe7cb1bc33e7479dd45eb (diff)
parentc0ee3cdcc5f7d610a08415feaa6572c729c64b62 (diff)
downloadnextcloud-server-0c501a89db8b23b45d88dbac2159c1f3e6ac47e6.tar.gz
nextcloud-server-0c501a89db8b23b45d88dbac2159c1f3e6ac47e6.zip
Merge pull request #8850 from nextcloud/backport/8835/stable12
[stable12] group existence check works without attribute (like with users)
Diffstat (limited to 'apps')
-rw-r--r--apps/user_ldap/lib/Access.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/user_ldap/lib/Access.php b/apps/user_ldap/lib/Access.php
index a805c63ffc1..1d44ec0362a 100644
--- a/apps/user_ldap/lib/Access.php
+++ b/apps/user_ldap/lib/Access.php
@@ -460,6 +460,7 @@ class Access extends LDAPUtility implements IUserTools {
*
* @param string[] $groupDNs
* @return string[]
+ * @throws ServerNotAvailableException
*/
public function groupsMatchFilter($groupDNs) {
$validGroupDNs = [];
@@ -480,7 +481,7 @@ class Access extends LDAPUtility implements IUserTools {
continue;
}
- $result = $this->readAttribute($dn, 'cn', $this->connection->ldapGroupFilter);
+ $result = $this->readAttribute($dn, '', $this->connection->ldapGroupFilter);
if(is_array($result)) {
$this->connection->writeToCache($cacheKey, true);
$validGroupDNs[] = $dn;