[Pkg-owncloud-commits] [owncloud] 176/258: dn needs to be fetched to be able to detect memberOf support

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 5ddacaed7f5ba5a238f0373f813ab0bb2cdd6e9b
Author: Arthur Schiwon <blizzz at owncloud.com>
Date:   Fri Sep 26 15:36:49 2014 +0200

    dn needs to be fetched to be able to detect memberOf support
---
 apps/user_ldap/lib/wizard.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/user_ldap/lib/wizard.php b/apps/user_ldap/lib/wizard.php
index fdf65a3..b08516a 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;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git