From: Gunnar Wrobel <p@rdus.de>
Date: Fri, 3 Apr 2009 15:04:14 +0000 (+0200)
Subject: Ensure the LDAP driver actually gets the configuration.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=6d044e3023b918745d9c8c5450cbf80b5020cddb;p=horde.git

Ensure the LDAP driver actually gets the configuration.
---

diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/Ldap.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Ldap.php
index f7371db07..c06df83da 100644
--- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Ldap.php
+++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Ldap.php
@@ -37,6 +37,13 @@ class Horde_Kolab_Server_Ldap extends Horde_Kolab_Server
     private $_ldap;
 
     /**
+     * The configuration for connection to the LDAP server.
+     *
+     * @var array
+     */
+    private $_config;
+
+    /**
      * Base DN of the LDAP server.
      *
      * @var string
@@ -73,6 +80,8 @@ class Horde_Kolab_Server_Ldap extends Horde_Kolab_Server
         $config['binddn'] = $config['uid'];
         $config['bindpw'] = $config['pass'];
 
+        $this->_config = $config;
+
         $this->connect();
 
         parent::__construct($params);
@@ -88,7 +97,7 @@ class Horde_Kolab_Server_Ldap extends Horde_Kolab_Server
      */
     protected function connect()
     {
-        $this->_ldap = Net_LDAP2::connect($config);
+        $this->_ldap = Net_LDAP2::connect($this->_config);
         if (is_a($this->_ldap, 'PEAR_Error')) {
             throw new Horde_Kolab_Server_Exception($this->_ldap);
         }