From: psc <psc@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 15 Jul 2009 08:57:41 +0000 (+0000)
Subject: Added a new special casing for debconf variables
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8974f60e279aec55020c6a509de95d2c568befab;p=gosa.git

Added a new special casing for debconf variables


git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.6-lhm@13929 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/trunk/gosa-plugins/fai/admin/fai/class_FAI.inc b/trunk/gosa-plugins/fai/admin/fai/class_FAI.inc
index 9f0805f7f..292269497 100644
--- a/trunk/gosa-plugins/fai/admin/fai/class_FAI.inc
+++ b/trunk/gosa-plugins/fai/admin/fai/class_FAI.inc
@@ -1284,8 +1284,8 @@ class FAI
     global $config;
     $Current_DN = $dn;
 
-    /* special case partitions, as they don't start with cn= in their DN (schema bug?) */
-    if (preg_match('/^FAIpartitionNr=/', $Current_DN)){
+    /* special case partitions and debconf variables, as they don't start with cn= in their DN */
+    if (preg_match('/^(FAIpartitionNr|FAIvariable)=/', $Current_DN)){
       return false;
     }
 
@@ -1333,8 +1333,8 @@ class FAI
     $tmp_dn = $Current_DN;
     $parent_dn = array();
 
-    /* special case partitions, as they don't start with cn= in their DN (schema bug?) */
-    $tmp_dn = preg_replace('/^FAIpartitionNr=/', 'cn=', $tmp_dn);
+    /* special case partitions and debconf variables, as they don't start with cn= in their DN */
+    $tmp_dn = preg_replace('/^(FAIpartitionNr|FAIvariable)=/', 'cn=', $tmp_dn);
 
     $tmp_dn = gosa_ldap_explode_dn($tmp_dn);
     while(preg_match('/^cn=/', $tmp_dn[$i])) {