[Pkg-owncloud-commits] [owncloud] 333/394: merge backport e122fdbcb63cc4e36982dc23bd2a38c904417447

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to annotated tag v4.5.10
in repository owncloud.

commit 612fb0a2439540d9e550822de6e485ec92241406
Author: Arthur Schiwon <blizzz at owncloud.com>
Date:   Wed Feb 6 14:30:17 2013 +0100

    merge backport e122fdbcb63cc4e36982dc23bd2a38c904417447
---
 apps/user_ldap/lib/connection.php |    5 +++++
 1 file changed, 5 insertions(+)

diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php
index 3d320db..616f6de 100644
--- a/apps/user_ldap/lib/connection.php
+++ b/apps/user_ldap/lib/connection.php
@@ -262,6 +262,11 @@ class Connection {
 			\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);
 		}
+		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);
+		}
 
 
 		//second step: critical checks. If left empty or filled wrong, set as unconfigured and give a warning.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git