diff options
| author | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2007-09-09 17:58:13 +0000 |
|---|---|---|
| committer | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2007-09-09 17:58:13 +0000 |
| commit | 33a8c85ad8859a0f50aed605251aa592241c9714 (patch) | |
| tree | 7210d717c12d10f105901ccb3983b8ad637db206 | |
| parent | ee82629d89b54694b9087dbbcb9c91e764e2561d (diff) | |
Applied patch for LDAP version (#1484552)
git-svn-id: https://svn.roundcube.net/trunk@787 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/CHANGELOG | 6 | ||||
| -rw-r--r-- | roundcubemail/config/main.inc.php.dist | 1 | ||||
| -rw-r--r-- | roundcubemail/program/include/rcube_ldap.inc | 5 |
3 files changed, 11 insertions, 1 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG index dd3c33e4f..eccf2562d 100644 --- a/roundcubemail/CHANGELOG +++ b/roundcubemail/CHANGELOG @@ -1,6 +1,12 @@ CHANGELOG RoundCube Webmail --------------------------- +2007/09/09 (thomasb) +---------- +- Applied patch for LDAP version (#1484552) +- Improved XHTML validation + + 2007/09/05 (thomasb) ---------- - Fix message list selection (#1484550) diff --git a/roundcubemail/config/main.inc.php.dist b/roundcubemail/config/main.inc.php.dist index 4cf7b7f86..ce6396da8 100644 --- a/roundcubemail/config/main.inc.php.dist +++ b/roundcubemail/config/main.inc.php.dist @@ -199,6 +199,7 @@ $rcmail_config['mail_header_delimiter'] = NULL; * 'base_dn' => '', * 'bind_dn' => '', * 'bind_pass' => '', + * 'ldap_version' => 3, // using LDAPv3 * 'search_fields' => array('mail', 'cn'), // fields to search in * 'name_field' => 'cn', // this field represents the contact's name * 'email_field' => 'mail', // this field represents the contact's e-mail diff --git a/roundcubemail/program/include/rcube_ldap.inc b/roundcubemail/program/include/rcube_ldap.inc index e6a15d9dc..3de018426 100644 --- a/roundcubemail/program/include/rcube_ldap.inc +++ b/roundcubemail/program/include/rcube_ldap.inc @@ -86,11 +86,14 @@ class rcube_ldap if (!is_array($this->prop['hosts'])) $this->prop['hosts'] = array($this->prop['hosts']); + if (empty($this->prop['ldap_version'])) + $this->prop['ldap_version'] = 3; + foreach ($this->prop['hosts'] as $host) { if ($lc = @ldap_connect($host, $this->prop['port'])) { - ldap_set_option($lc, LDAP_OPT_PROTOCOL_VERSION, $this->prop['port']); + ldap_set_option($lc, LDAP_OPT_PROTOCOL_VERSION, $this->prop['ldap_version']); $this->prop['host'] = $host; $this->conn = $lc; break; |