Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArthur Schiwon <blizzz@arthur-schiwon.de>2019-05-17 17:19:23 +0300
committerArthur Schiwon <blizzz@arthur-schiwon.de>2019-05-17 17:19:23 +0300
commit3372bcc7fcba026b9d2ac58812863e1e74c8ffdf (patch)
treeeee16e38d5a3302957b443ebc990bd2042b9c124 /lib/public/LDAP
parent528eb1b2239a66826f0793fead0e06ab576b7a13 (diff)
fixes possible override of uniqueMember by autodetection
* uniqueMember was the default so we did not know whether this setting is desired or the initial value * autodetection of the user-group association attribute runs only when it was not set (as far as we knew) * the default is now empty * thus LDAPProvider might return this value as well (in exceptional cases) * if a group base is given (edge case), use this instead of general base * resolves #12682 Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Diffstat (limited to 'lib/public/LDAP')
-rw-r--r--lib/public/LDAP/ILDAPProvider.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/public/LDAP/ILDAPProvider.php b/lib/public/LDAP/ILDAPProvider.php
index 9e13fb7e796..586481d837e 100644
--- a/lib/public/LDAP/ILDAPProvider.php
+++ b/lib/public/LDAP/ILDAPProvider.php
@@ -151,7 +151,7 @@ interface ILDAPProvider {
/**
* Get the LDAP attribute name for the type of association betweeen users and groups
* @param string $gid group id
- * @return string the configuration, one of: 'memberUid', 'uniqueMember', 'member', 'gidNumber'
+ * @return string the configuration, one of: 'memberUid', 'uniqueMember', 'member', 'gidNumber', ''
* @throws \Exception if group id was not found in LDAP
* @since 13.0.0
*/