From 3372bcc7fcba026b9d2ac58812863e1e74c8ffdf Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Fri, 17 May 2019 16:19:23 +0200 Subject: 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 --- lib/public/LDAP/ILDAPProvider.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/public') 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 */ -- cgit v1.2.3