summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2018-03-16 09:31:49 +0100
committerGitHub <noreply@github.com>2018-03-16 09:31:49 +0100
commitf83aa58d1f82beee86d3e91f390efb48b98a52e0 (patch)
treec4eaddbc064307edc906c6f231731c6c9a56cc6f /apps
parentb7e7ae5d6d95af8e84f27f90e78d14bfd6e156b5 (diff)
parentcbf60f2e91c6028c5b1bbf6a48e4042c59a95a0a (diff)
downloadnextcloud-server-f83aa58d1f82beee86d3e91f390efb48b98a52e0.tar.gz
nextcloud-server-f83aa58d1f82beee86d3e91f390efb48b98a52e0.zip
Merge pull request #8835 from nextcloud/fix/noid/ldap_existence_check
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 0c87bd9c069..9fb37090270 100644
--- a/apps/user_ldap/lib/Access.php
+++ b/apps/user_ldap/lib/Access.php
@@ -472,6 +472,7 @@ class Access extends LDAPUtility implements IUserTools {
*
* @param string[] $groupDNs
* @return string[]
+ * @throws ServerNotAvailableException
*/
public function groupsMatchFilter($groupDNs) {
$validGroupDNs = [];
@@ -492,7 +493,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;