diff options
| author | Arthur Schiwon <blizzz@owncloud.com> | 2013-03-11 13:30:06 +0100 |
|---|---|---|
| committer | Arthur Schiwon <blizzz@owncloud.com> | 2013-03-11 13:30:06 +0100 |
| commit | 1e07801c95b367f9e4c0d8f58c3796a116084310 (patch) | |
| tree | 3cc1416931d2e5c0d42632d1fbb294edd956791b /apps/user_ldap/lib | |
| parent | 1e20067c005a2363b06b8e163c95c75a32dea3b0 (diff) | |
| download | nextcloud-server-1e07801c95b367f9e4c0d8f58c3796a116084310.tar.gz nextcloud-server-1e07801c95b367f9e4c0d8f58c3796a116084310.zip | |
LDAP: compatibility with Novell eDirectory UUID
Diffstat (limited to 'apps/user_ldap/lib')
| -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); |