diff options
| author | Arthur Schiwon <blizzz@arthur-schiwon.de> | 2019-05-17 16:19:23 +0200 |
|---|---|---|
| committer | Arthur Schiwon <blizzz@arthur-schiwon.de> | 2019-05-17 16:19:23 +0200 |
| commit | 3372bcc7fcba026b9d2ac58812863e1e74c8ffdf (patch) | |
| tree | eee16e38d5a3302957b443ebc990bd2042b9c124 /apps/user_ldap/js | |
| parent | 528eb1b2239a66826f0793fead0e06ab576b7a13 (diff) | |
| download | nextcloud-server-3372bcc7fcba026b9d2ac58812863e1e74c8ffdf.tar.gz nextcloud-server-3372bcc7fcba026b9d2ac58812863e1e74c8ffdf.zip | |
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 'apps/user_ldap/js')
| -rw-r--r-- | apps/user_ldap/js/wizard/wizardDetectorUserGroupAssociation.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/user_ldap/js/wizard/wizardDetectorUserGroupAssociation.js b/apps/user_ldap/js/wizard/wizardDetectorUserGroupAssociation.js index 953a0b909a6..a20bdd9ac9b 100644 --- a/apps/user_ldap/js/wizard/wizardDetectorUserGroupAssociation.js +++ b/apps/user_ldap/js/wizard/wizardDetectorUserGroupAssociation.js @@ -27,7 +27,7 @@ OCA = OCA || {}; run: function(model, configID) { // TODO: might be better with configuration marker as uniqueMember // is a valid value (although probably less common then member and memberUid). - if(model.configuration.ldap_group_member_assoc_attribute && model.configuration.ldap_group_member_assoc_attribute !== 'uniqueMember') { + if(model.configuration.ldap_group_member_assoc_attribute && model.configuration.ldap_group_member_assoc_attribute !== '') { // a value is already set. Don't overwrite and don't ask LDAP // without reason. return false; |