mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2234 from owncloud/fix_ldap_edirectory 

LDAP: compatibility with Novell eDirectory UUID
This commit is contained in:
Frank Karlitschek 2013-03-12 10:21:49 -07:00
parent 569c7ab138 1e07801c95
commit 43d15066f9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/user_ldap/lib/access.php
View File

@ -84,7 +84,7 @@ abstract class Access {
for($i=0;$i<$result[$attr]['count'];$i++) { for($i=0;$i<$result[$attr]['count'];$i++) {
if($this->resemblesDN($attr)) { if($this->resemblesDN($attr)) {
$values[] = $this->sanitizeDN($result[$attr][$i]); $values[] = $this->sanitizeDN($result[$attr][$i]);
} elseif(strtolower($attr) == 'objectguid') { } elseif(strtolower($attr) == 'objectguid' || strtolower($attr) == 'guid') {
$values[] = $this->convertObjectGUID2Str($result[$attr][$i]); $values[] = $this->convertObjectGUID2Str($result[$attr][$i]);
} else { } else {
$values[] = $result[$attr][$i]; $values[] = $result[$attr][$i];
@ -895,7 +895,7 @@ abstract class Access {
} }
//for now, supported (known) attributes are entryUUID, nsuniqueid, objectGUID //for now, supported (known) attributes are entryUUID, nsuniqueid, objectGUID
$testAttributes = array('entryuuid', 'nsuniqueid', 'objectguid'); $testAttributes = array('entryuuid', 'nsuniqueid', 'objectguid', 'guid');
foreach($testAttributes as $attribute) { foreach($testAttributes as $attribute) {
\OCP\Util::writeLog('user_ldap', 'Testing '.$attribute.' as UUID attr', \OCP\Util::DEBUG); \OCP\Util::writeLog('user_ldap', 'Testing '.$attribute.' as UUID attr', \OCP\Util::DEBUG);