Changeset cd67494 in github

Timestamp:

Jun 6, 2008 5:38:30 AM (5 years ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

70a0566

Parents:

cfe4a6b

Message:

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

Files:

• CHANGELOG (modified) (1 diff)
• config/main.inc.php.dist (modified) (1 diff)
• program/include/rcube_ldap.php (modified) (1 diff)

CHANGELOG

@@ -1 +1 @@
 CHANGELOG RoundCube Webmail
 ---------------------------
+
+2008/06/06 (alec)
+----------
+- TLS support in LDAP connections: 'use_tls' property (#1485104)
 
 2008/06/05 (alec)

config/main.inc.php.dist

@@ -248 +248 @@
  *  'hosts'         => array('directory.verisign.com'),
  *  'port'          => 389,
+ *  'use_tls'       => false,
  *  'user_specific' => false,   // If true the base_dn, bind_dn and bind_pass default to the user's IMAP login.
  *  // %fu - The full username provided, assumes the username is an email

program/include/rcube_ldap.php

@@ -95 +95 @@
       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;