diff options
| author | Arthur Schiwon <blizzz@owncloud.com> | 2013-02-06 14:30:17 +0100 |
|---|---|---|
| committer | Arthur Schiwon <blizzz@owncloud.com> | 2013-02-06 14:30:17 +0100 |
| commit | e122fdbcb63cc4e36982dc23bd2a38c904417447 (patch) | |
| tree | d46fca9a23078f01f917d3ab88474a60b56fa19e /apps/user_ldap/lib/connection.php | |
| parent | 33ec26f6d62b7558bac3665b90315c950e5cb7b0 (diff) | |
| download | nextcloud-server-e122fdbcb63cc4e36982dc23bd2a38c904417447.tar.gz nextcloud-server-e122fdbcb63cc4e36982dc23bd2a38c904417447.zip | |
LDAP: when ldaps and tls are configured, disable the latter one - they do not work together. ldaps already creates a secure connection.
Diffstat (limited to 'apps/user_ldap/lib/connection.php')
| -rw-r--r-- | apps/user_ldap/lib/connection.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php index acc33e047c6..38b2b131e50 100644 --- 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); + } |