LDAP: when ldaps and tls are configured, disable the latter one - they do not work...

diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php
index acc33e047c64b9c1c6f9fd6b9bbd56fab1934c5f..38b2b131e50db41e60aaea83f9a2fbea7a30bd2b 100644 (file)
--- a/apps/user_ldap/lib/connection.php
+++ b/apps/user_ldap/lib/connection.php
@@ -409,6 +409,11 @@ class Connection {
                                $this->config[$key] = array();
                        }
                }
+               if((strpos($this->config['ldapHost'], 'ldaps') === 0)
+                       && $this->config['ldapTLS']) {
+                       $this->config['ldapTLS'] = false;
+                       \OCP\Util::writeLog('user_ldap', 'LDAPS (already using secure connection) and TLS do not work together. Switched of TLS.', \OCP\Util::INFO);
+               }