diff options
| author | Arthur Schiwon <blizzz@owncloud.com> | 2013-04-26 15:02:05 +0200 |
|---|---|---|
| committer | Arthur Schiwon <blizzz@owncloud.com> | 2013-05-06 10:17:52 +0200 |
| commit | d659d8e1931eb36de88b21647234ef3748ef7e5a (patch) | |
| tree | 1657a2451b9d20d583c820374a5422b46e952575 /apps/user_ldap/lib/connection.php | |
| parent | 51a1f829b897d590723f4182293cf471aff1dd83 (diff) | |
| download | nextcloud-server-d659d8e1931eb36de88b21647234ef3748ef7e5a.tar.gz nextcloud-server-d659d8e1931eb36de88b21647234ef3748ef7e5a.zip | |
LDAP: do not reset UUID attribute setting when guid is detected
Diffstat (limited to 'apps/user_ldap/lib/connection.php')
| -rw-r--r-- | apps/user_ldap/lib/connection.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php index 20784570e93..ef7cc5295b3 100644 --- a/apps/user_ldap/lib/connection.php +++ b/apps/user_ldap/lib/connection.php @@ -427,7 +427,9 @@ class Connection { 'No group filter is specified, LDAP group feature will not be used.', \OCP\Util::INFO); } - if(!in_array($this->config['ldapUuidAttribute'], array('auto', 'entryuuid', 'nsuniqueid', 'objectguid')) + $uuidAttributes = array( + 'auto', 'entryuuid', 'nsuniqueid', 'objectguid', 'guid'); + if(!in_array($this->config['ldapUuidAttribute'], $uuidAttributes) && (!is_null($this->configID))) { \OCP\Config::setAppValue($this->configID, $this->configPrefix.'ldap_uuid_attribute', 'auto'); \OCP\Util::writeLog('user_ldap', |