From: hickert Date: Fri, 18 Jul 2008 07:37:58 +0000 (+0000) Subject: Updated FAI X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=3715a9c50a561119ef3eab316e27d79d52ee00c6;p=gosa.git Updated FAI -In we modifed an inherited object, the FAIstate wasn't updated for freezed objects. git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@11709 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/gosa-plugins/fai/admin/fai/class_FAI.inc b/gosa-plugins/fai/admin/fai/class_FAI.inc index fd763df9f..e2421b443 100644 --- a/gosa-plugins/fai/admin/fai/class_FAI.inc +++ b/gosa-plugins/fai/admin/fai/class_FAI.inc @@ -369,9 +369,9 @@ class FAI /* Get some basic informations */ $base_release = FAI::get_release_dn($Current_DN); - $sub_releases = FAI:: get_sub_releases_of_this_release($base_release,true); + $sub_releases = FAI::get_sub_releases_of_this_release($base_release,true); $parent_obj = FAI::get_parent_release_object($Current_DN); - $following_releases = FAI:: get_sub_releases_of_this_release($base_release,true); + $following_releases = $sub_releases; /* Check if given dn exists or if is a new entry */ $ldap->cat($Current_DN); @@ -495,11 +495,17 @@ class FAI /* check if we must patch the follwing release */ if(!empty($r)){ + foreach($r as $key ){ if(DEBUG_FAI_FUNC) { echo "Copy current objects original attributes to next release ".$key; print_a($parent_attrs); } + + /* Append FAIstate tag to ensure that freezed objects stay freezed + */ + $rTag = FAI::get_release_tag(FAI::get_release_dn($key)); + $parent_attrs['FAIstate'] = $rTag; FAI::save_FAI_object($key,$parent_attrs); } }