LDAP: take out ldapUuidAttribute from on-the-fly check, cannot be set by the user...

diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php
index 1922e7ff1f28d9ffbbdc2a9e40022e34feffc310..bf65d9ad91c8870bc41cf7d0eafe24ce11de1e7d 100644 (file)
--- 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
+}