diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2014-09-29 14:46:10 +0200 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2014-09-29 14:46:10 +0200 |
| commit | 6b45cb5416ddd8d06de628b984cc773567770565 (patch) | |
| tree | 65e3e71888f85f783d5bb553b37fd5c15fec734f | |
| parent | a8ed427515a925b1f768c4eac8ce24b879de26b5 (diff) | |
| parent | 6041ae6224125192ba4b75b09b788aa234f5f30a (diff) | |
| download | nextcloud-server-6b45cb5416ddd8d06de628b984cc773567770565.tar.gz nextcloud-server-6b45cb5416ddd8d06de628b984cc773567770565.zip | |
Merge pull request #11321 from owncloud/ldap-fix-memberof-detection
dn needs to be fetched to be able to detect memberOf support
| -rw-r--r-- | apps/user_ldap/lib/wizard.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/apps/user_ldap/lib/wizard.php b/apps/user_ldap/lib/wizard.php index 7f0d32ead68..e2a85ea5eb9 100644 --- a/apps/user_ldap/lib/wizard.php +++ b/apps/user_ldap/lib/wizard.php @@ -377,9 +377,11 @@ class Wizard extends LDAPUtility { $limit = 400; $offset = 0; do { - $result = $this->access->searchGroups($filter, array('cn'), $limit, $offset); + // we need to request dn additionally here, otherwise memberOf + // detection will fail later + $result = $this->access->searchGroups($filter, array('cn', 'dn'), $limit, $offset); foreach($result as $item) { - $groupNames[] = $item[0]; + $groupNames[] = $item['cn']; $groupEntries[] = $item; } $offset += $limit; |