- TLS support in LDAP connections: 'use_tls' property (#1485104)

git-svn-id: https://svn.roundcube.net/trunk@1481 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 4 insertions, 0 deletions

diff --git a/roundcubemail/program/include/rcube_ldap.php b/roundcubemail/program/include/rcube_ldap.php
index c5962030f..df68f34f8 100644
--- a/roundcubemail/program/include/rcube_ldap.php
+++ b/roundcubemail/program/include/rcube_ldap.php
@@ -94,6 +94,10 @@ class rcube_ldap
     {
       if ($lc = @ldap_connect($host, $this->prop['port']))
       {
+	if ($this->prop['use_tls']===true || strtoupper($this->prop['use_tls'])==='TRUE')
+	  if (!ldap_start_tls($lc))
+	    continue;
+
         ldap_set_option($lc, LDAP_OPT_PROTOCOL_VERSION, $this->prop['ldap_version']);
         $this->prop['host'] = $host;
         $this->conn = $lc;