wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

treat dn as any other attribute when building the search() return array

Browse source
This commit is contained in:
Arthur Schiwon 2015-10-08 21:18:34 +02:00
parent dd2e887a8d
commit a876efda50
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/user_ldap/group_ldap.php
View file

@ -491,7 +491,7 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
array($this->access->connection->ldapGroupDisplayName, 'dn')); array($this->access->connection->ldapGroupDisplayName, 'dn'));
if (is_array($groups)) { if (is_array($groups)) {
foreach ($groups as $groupobj) { foreach ($groups as $groupobj) {
$groupDN = $groupobj['dn']; $groupDN = $groupobj['dn'][0];
$allGroups[$groupDN] = $groupobj; $allGroups[$groupDN] = $groupobj;
$nestedGroups = $this->access->connection->ldapNestedGroups; $nestedGroups = $this->access->connection->ldapNestedGroups;
if (!empty($nestedGroups)) { if (!empty($nestedGroups)) {

6
apps/user_ldap/lib/access.php
View file

@ -532,7 +532,7 @@ class Access extends LDAPUtility implements user\IUserTools {
$nameByLDAP = $ldapObject[$nameAttribute][0]; $nameByLDAP = $ldapObject[$nameAttribute][0];
} }
$ocName = $this->dn2ocname($ldapObject['dn'], $nameByLDAP, $isUsers); $ocName = $this->dn2ocname($ldapObject['dn'][0], $nameByLDAP, $isUsers);
if($ocName) { if($ocName) {
$ownCloudNames[] = $ocName; $ownCloudNames[] = $ocName;
if($isUsers) { if($isUsers) {
@ -692,7 +692,7 @@ class Access extends LDAPUtility implements user\IUserTools {
*/ */
public function batchApplyUserAttributes(array $ldapRecords){ public function batchApplyUserAttributes(array $ldapRecords){
foreach($ldapRecords as $userRecord) { foreach($ldapRecords as $userRecord) {
$ocName = $this->dn2ocname($userRecord['dn'], $userRecord[$this->connection->ldapUserDisplayName]); $ocName = $this->dn2ocname($userRecord['dn'][0], $userRecord[$this->connection->ldapUserDisplayName]);
$this->cacheUserExists($ocName); $this->cacheUserExists($ocName);
$user = $this->userManager->get($ocName); $user = $this->userManager->get($ocName);
$user->processAttributes($userRecord); $user->processAttributes($userRecord);
@ -1012,7 +1012,7 @@ class Access extends LDAPUtility implements user\IUserTools {
$this->sanitizeDN($item[$key]) $this->sanitizeDN($item[$key])
: $item[$key]; : $item[$key];
} else { } else {
$selection[$i][$key] = $this->sanitizeDN($item[$key]); $selection[$i][$key] = [$this->sanitizeDN($item[$key])];
} }
} }

4
apps/user_ldap/user_ldap.php
View file

@ -78,7 +78,7 @@ class USER_LDAP extends BackendUtility implements \OCP\IUserBackend, \OCP\UserIn
public function loginName2UserName($loginName) { public function loginName2UserName($loginName) {
try { try {
$ldapRecord = $this->getLDAPUserByLoginName($loginName); $ldapRecord = $this->getLDAPUserByLoginName($loginName);
$user = $this->access->userManager->get($ldapRecord['dn']); $user = $this->access->userManager->get($ldapRecord['dn'][0]);
if($user instanceof OfflineUser) { if($user instanceof OfflineUser) {
return false; return false;
} }
@ -119,7 +119,7 @@ class USER_LDAP extends BackendUtility implements \OCP\IUserBackend, \OCP\UserIn
} catch(\Exception $e) { } catch(\Exception $e) {
return false; return false;
} }
$dn = $ldapRecord['dn']; $dn = $ldapRecord['dn'][0];
$user = $this->access->userManager->get($dn); $user = $this->access->userManager->get($dn);
if(!$user instanceof User) { if(!$user instanceof User) {