X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fsetup%2Fclass_setupStep_Ldap.inc;h=03525da833329b87746a20781aef3dcd88181401;hb=2125b18db9a09e5ad6d2a1fcbac017b67e165cd6;hp=a590a3bf07c503c8ab13a486784649a3f8675c92;hpb=a2b85ae2ff9c0e3ba37142aa5292cb801653c46f;p=gosa.git

diff --git a/gosa-core/setup/class_setupStep_Ldap.inc b/gosa-core/setup/class_setupStep_Ldap.inc
index a590a3bf0..03525da83 100644
--- a/gosa-core/setup/class_setupStep_Ldap.inc
+++ b/gosa-core/setup/class_setupStep_Ldap.inc
@@ -40,7 +40,7 @@ class Step_Ldap extends setup_step
   var $rfc2307bis             = FALSE;
   var $attributes = array("connection","location","admin","password","base","admin_given","append_base_to_admin_dn","tls","rfc2307bis");
 
-  var $header_image= "images/proxy.png";
+  var $header_image= "images/setup/ldap.png";
 
   function Step_Ldap()
   {
@@ -122,12 +122,16 @@ class Step_Ldap extends setup_step
   function resolve_user()
   {
     $filter  = $this->resolve_filter;
-    $ldap = new LDAP("","",$this->connection);
+
+    /* Establish ldap connection */
+    $cv = $this->parent->captured_values;
+    $ldap_l = new LDAP("","",$this->connection, FALSE, $this->tls);
+    $ldap = new ldapMultiplexer($ldap_l);
     $ldap->cd($this->base);
     $ldap->search("(&(objectClass=person)(|(uid=".$filter.")(cn=".$filter.")))");
     $tmp = array();
     while($attrs = $ldap->fetch()){
-      $tmp[base64_encode($attrs['dn'])]= @LDAP::fix($attrs['dn']);
+      $tmp[base64_encode($attrs['dn'])]= LDAP::fix($attrs['dn']);
       natcasesort($tmp);
     }
     return($tmp);