diff options
| author | Frank Karlitschek <frank@owncloud.org> | 2013-03-12 10:21:49 -0700 |
|---|---|---|
| committer | Frank Karlitschek <frank@owncloud.org> | 2013-03-12 10:21:49 -0700 |
| commit | 43d15066f972ce7de722f3ca998bfe9147da911f (patch) | |
| tree | bbdbd11d1168d1336f3b9f5253711e7e251d287e /apps | |
| parent | 569c7ab1384c9d01255ae7bc2075edf11508d4a6 (diff) | |
| parent | 1e07801c95b367f9e4c0d8f58c3796a116084310 (diff) | |
| download | nextcloud-server-43d15066f972ce7de722f3ca998bfe9147da911f.tar.gz nextcloud-server-43d15066f972ce7de722f3ca998bfe9147da911f.zip | |
Merge pull request #2234 from owncloud/fix_ldap_edirectory
LDAP: compatibility with Novell eDirectory UUID
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/user_ldap/lib/access.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php index a8cfd45bf4d..90d026962db 100644 --- a/apps/user_ldap/lib/access.php +++ b/apps/user_ldap/lib/access.php @@ -84,7 +84,7 @@ abstract class Access { for($i=0;$i<$result[$attr]['count'];$i++) { if($this->resemblesDN($attr)) { $values[] = $this->sanitizeDN($result[$attr][$i]); - } elseif(strtolower($attr) == 'objectguid') { + } elseif(strtolower($attr) == 'objectguid' || strtolower($attr) == 'guid') { $values[] = $this->convertObjectGUID2Str($result[$attr][$i]); } else { $values[] = $result[$attr][$i]; @@ -895,7 +895,7 @@ abstract class Access { } //for now, supported (known) attributes are entryUUID, nsuniqueid, objectGUID - $testAttributes = array('entryuuid', 'nsuniqueid', 'objectguid'); + $testAttributes = array('entryuuid', 'nsuniqueid', 'objectguid', 'guid'); foreach($testAttributes as $attribute) { \OCP\Util::writeLog('user_ldap', 'Testing '.$attribute.' as UUID attr', \OCP\Util::DEBUG); |