- Add possibility to do LDAP bind before searching for bind DN.

  In deployments where anonymous binds to and/or searches on an LDAP tree are not
  allowed, and where the LDAP address book(s) have been configured to use the
  user-specific bind credentials, rcube_ldap.php needs to bind using service
  credentials in order to be able to find the user's bind dn.


git-svn-id: https://svn.roundcube.net/trunk@5515 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 58e2ca921..4d65bfa7a 100644
--- a/roundcubemail/program/include/rcube_ldap.php
+++ b/roundcubemail/program/include/rcube_ldap.php
@@ -236,6 +236,10 @@ class rcube_ldap extends rcube_addressbook
             $replaces = array('%dn' => '', '%dc' => $dc, '%d' => $d, '%fu' => $fu, '%u' => $u);
 
             if ($this->prop['search_base_dn'] && $this->prop['search_filter']) {
+                if (!empty$this->prop['search_bind_dn']) && !empty($this->prop['search_bind_pw'])) {
+                    $this->bind($this->prop['search_bind_dn'], $this->prop['search_bind_pw']);
+                }
+
                 // Search for the dn to use to authenticate
                 $this->prop['search_base_dn'] = strtr($this->prop['search_base_dn'], $replaces);
                 $this->prop['search_filter'] = strtr($this->prop['search_filter'], $replaces);