Apply fix for #4177

[gosa.git] / trunk / gosa-plugins / fai / admin / fai / class_faiPartitionTable.inc

diff --git a/trunk/gosa-plugins/fai/admin/fai/class_faiPartitionTable.inc b/trunk/gosa-plugins/fai/admin/fai/class_faiPartitionTable.inc
index 596e4ba0e3394c04f8849b3a26440e30bffcd2c8..07f4ab386798af451d243afc8c6f886daea2af88 100644 (file)
--- a/trunk/gosa-plugins/fai/admin/fai/class_faiPartitionTable.inc
+++ b/trunk/gosa-plugins/fai/admin/fai/class_faiPartitionTable.inc
@@ -493,12 +493,8 @@ class faiPartitionTable extends plugin
 
     /* Read all leaf objects of this object (For FAIscript this would be FAIscriptEntry)
      */
-    $res = FAI::get_all_objects_for_given_base($source['dn'],"(&(objectClass=FAIclass)(objectClass=FAIpartitionDisk))");
+    $res = FAI::get_leaf_objects($source['dn'], $source['cn'][0], "FAIpartitionDisk", get_ou('faiPartitionRDN'));
     foreach($res as $obj){
-
-      /* Skip not relevant objects */
-      if(!preg_match("/".preg_quote($source['dn'], '/')."$/i",$obj['dn'])) continue;
-
       $objects = array();
       $objects['description']  = "";
       $objects['status']      = "edited";
@@ -511,12 +507,8 @@ class faiPartitionTable extends plugin
     /* read all partitions for each disk
      */
     foreach($this->disks as $name => $disk){
-      $res = FAI::get_all_objects_for_given_base($disk['dn'],"(&(objectClass=FAIclass)(objectClass=FAIpartitionEntry))");
+      $res = FAI::get_leaf_objects($disk['dn'], $name, "FAIpartitionEntry", "cn=".$source['cn'][0].",".get_ou('faiPartitionRDN'));
       foreach($res as $obj){
-
-        /* Skip not relevant objects */
-        if(!preg_match("/".preg_quote($disk['dn'], '/')."$/i",$obj['dn'])) continue;
-
         $objects = array();
         $objects['status']      = "edited";
         $objects['dn']          = $obj['dn'];