diff options
| author | Arthur Schiwon <blizzz@owncloud.com> | 2012-09-19 17:35:50 +0400 |
|---|---|---|
| committer | Arthur Schiwon <blizzz@owncloud.com> | 2012-09-19 17:37:05 +0400 |
| commit | f66c441f778b6b2d94576c5cf25076f2c0b8bcbc (patch) | |
| tree | 4da84ac141fedbb6d9ad33c73d307e41f6e2d727 | |
| parent | 73ed13fe75204de79e6808876c1787ffc776f148 (diff) | |
LDAP: take out ldapUuidAttribute from on-the-fly check, cannot be set by the user and would lead to server error. Fixes oc-1625
| -rw-r--r-- | apps/user_ldap/lib/connection.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php index 1922e7ff1f2..bf65d9ad91c 100644 --- a/apps/user_ldap/lib/connection.php +++ b/apps/user_ldap/lib/connection.php @@ -258,7 +258,7 @@ class Connection { if(empty($this->config['ldapGroupFilter']) && empty($this->config['ldapGroupMemberAssocAttr'])) { \OCP\Util::writeLog('user_ldap', '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'))) { + if(!in_array($this->config['ldapUuidAttribute'], array('auto','entryuuid', 'nsuniqueid', 'objectguid')) && (!is_null($this->configID))) { \OCP\Config::setAppValue($this->configID, 'ldap_uuid_attribute', 'auto'); \OCP\Util::writeLog('user_ldap', 'Illegal value for the UUID Attribute, reset to autodetect.', \OCP\Util::INFO); } @@ -357,4 +357,4 @@ class Connection { return true; } -}
\ No newline at end of file +} |