Updated remove template

[gosa.git] / gosa-core / setup / class_setupStep_Schema.inc

diff --git a/gosa-core/setup/class_setupStep_Schema.inc b/gosa-core/setup/class_setupStep_Schema.inc
index 63b6ce47334cf95873ec544d325fce93d64cef5a..c4784593f6d927503cc4bad9b4534662807c0828 100644 (file)
--- a/gosa-core/setup/class_setupStep_Schema.inc
+++ b/gosa-core/setup/class_setupStep_Schema.inc
@@ -68,15 +68,19 @@ class Step_Schema extends setup_step
     $cv = $this->parent->captured_values;
 
     /* Establish ldap connection */
-    $ldap = new LDAP($cv['admin'],
+    $ldap_l = new LDAP($cv['admin'],
         $cv['password'],
         $cv['connection'],
         FALSE,
         $cv['tls']);
 
+    $ldap = new ldapMultiplexer($ldap_l);
+
     /* Check if root object exists */
     $ldap->cd($cv['base']);
+    $ldap->set_size_limit(1);
     $res = $ldap->search("(objectClass=*)");
+    $ldap->set_size_limit(0);
 
     $smarty = get_smarty();
     $smarty->assign("bool",array(FALSE => _("No"), TRUE => _("Yes")));
@@ -106,13 +110,13 @@ class Step_Schema extends setup_step
   function check_schema()
   {
     $cfg = $this->parent->captured_values;
-    $rfc2307bis = $cfg['rfc2307bis'];
-    $this->checked = check_schema($cfg,$rfc2307bis);
 
     /* Get objectclasses */
     $ldap = new LDAP($cfg['admin'],$cfg['password'],$cfg['connection'] ,FALSE,$cfg['tls']);
-    $objectclasses = $ldap->get_objectclasses();
+    $objectclasses = $ldap->get_objectclasses(TRUE);
     $this->found_ocs = count($objectclasses);
+    $rfc2307bis = $cfg['rfc2307bis'];
+    $this->checked = check_schema($cfg,$rfc2307bis);
 
     /* Which samba version do we use? */
     if(isset($objectclasses['sambaSamAccount'])){