![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/trunk/gosa-plugins/fai/admin/fai/class_FAI.inc b/trunk/gosa-plugins/fai/admin/fai/class_FAI.inc
index 2a1dfe0da5cf6ff0a860b3ee8c163b9593e08cc8..c3005f198be79b6f83cc2ce2fffda6aecd5f79eb 100644 (file)
$name = preg_replace("/".preg_quote($release, '/')."/i","",$attr['dn']);
if(isset($attr['FAIstate'][0])){
- if(preg_match("/removed$/",$attr['FAIstate'][0])){
+ if(preg_match("/removed/",$attr['FAIstate'][0])){
if(isset($res[$name])){
unset($res[$name]);
}
}
foreach($r as $key ){
- if(DEBUG_FAI_FUNC) {
- echo "<b>Create an empty placeholder in follwing release</b> ".$key;
- print_a($objectAttrs);
- }
- /* Only save removed parent objects, not their children */
- if (FAI::is_parent_object($Current_DN)){
+ /* Only save removed parent objects, not their children, unless
+ they are a child of a copy-on-write parent in a subrelease */
+ if (FAI::is_parent_object($Current_DN) || FAI::is_child_of_cow_parent($key)){
+ if(DEBUG_FAI_FUNC) {
+ echo "<b>Create an empty placeholder in follwing release</b> ".$key;
+ print_a($objectAttrs);
+ }
FAI::save_FAI_object($key,$objectAttrs);
}
}
if(!empty($r)){
foreach($r as $key ){
- if(DEBUG_FAI_FUNC) {
- echo "<b>Copy current objects original attributes to next release</b> ".$key;
- print_a($parent_attrs);
- }
-
- /* Only update the freeze tag if the entry actually exists. */
- $ldap->cat($key);
- if($ldap->count()){
- /* Append FAIstate tag to ensure that freezed objects stay freezed
- */
- $rTag = FAI::get_release_tag(FAI::get_release_dn($key));
- $parent_attrs['FAIstate'] = $rTag;
+ /* Append FAIstate tag to ensure that freezed objects stay freezed
+ */
+ $rTag = FAI::get_release_tag(FAI::get_release_dn($key));
+ $parent_attrs['FAIstate'] = $rTag;
+ /* Don't copy over subobjects in subreleases if their parent is in "removed" state */
+ if(!FAI::parent_is_removed($key)){
+ /* FAItemplateFile can be binary, therefore it needs to be fetched with
+ * $ldap->get_attribute */
+ if (isset($parent_attrs['FAItemplateFile'])) {
+ $parent_attrs['FAItemplateFile'] = $ldap->get_attribute($parent_obj, 'FAItemplateFile');
+ }
+ if(DEBUG_FAI_FUNC) {
+ echo "<b>Copy current objects original attributes to next release</b> ".$key;
+ print_a($parent_attrs);
+ }
FAI::save_FAI_object($key,$parent_attrs);
}
}
/* this function will remove all unused (deleted) objects,
- that have no parent object */
- static function clean_up_releases($Current_DN)
+ that have no parent object. If $recursive is set to true,
+ also check sub releases. */
+ static function clean_up_releases($Current_DN, $recursive=true)
{
global $config;
$ldap = $config->get_ldap_link();
/* We must also include the given release dn */
$previous_releases[] = $base_release;
- /* Merge parent, current and child releases into one big release to
- iterate over */
$all_releases = $previous_releases;
- foreach($sub_releases as $sub_release){
- $all_releases[] = $sub_release;
+
+ if ($recursive) {
+ /* Merge parent, current and child releases into one big release to
+ iterate over */
+ foreach($sub_releases as $sub_release){
+ $all_releases[] = $sub_release;
+ }
}
/* Walk through all releases */
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;
}
}
}
- /* Return a child objects, if there are any */
+ /* Return child objects, if there are any */
static function get_child_objects($dn)
{
global $config;
if (FAI::is_parent_object($Current_DN)){
$ldap = $config->get_ldap_link();
- $ldap->cd($config->current['BASE']);
+ $ldap->cd($dn);
$ldap->search("(objectClass=FAIclass)",array("dn"));
while($attrs = $ldap->fetch()){
- $newdn=$attrs['dn'];
if(preg_match("/".preg_quote($Current_DN, '/')."/",$attrs['dn']) && $attrs['dn'] != $Current_DN){
$children[] = $attrs['dn'];
}
return $children;
}
- /* Get the DN of the parent object; e.g. the FAIpartitionTable of a FAIpartitionDisk */
- static function get_parent_object($dn)
+ /* Get the DN of the parent object; e.g. the FAIpartitionTable of a FAIpartitionDisk.
+ If $check is false, do not check whether the parent actually exists in LDAP */
+ static function get_parent_object($dn, $check=true)
{
global $config;
$Current_DN = $dn;
$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])) {
$parent_dn = join($parent_dn, ',');
if ($parent_dn != $Current_DN){
- $ldap = $config->get_ldap_link();
- $ldap->cd($config->current['BASE']);
- $ldap->cat($parent_dn);
- if($ldap->count()){
- return $parent_dn;
+ if($check){
+ $ldap = $config->get_ldap_link();
+ $ldap->cd($config->current['BASE']);
+ $ldap->cat($parent_dn);
+ if(!$ldap->count()){
+ return "";
+ }
}
+ return $parent_dn;
}
return "";
}
}
return false;
}
+
+ /* Check whether this is a child object of a Copy-on-Write parent */
+ static function is_child_of_cow_parent($dn)
+ {
+ global $config;
+ $Current_DN = $dn;
+ $parent_dn = "";
+
+ if (!FAI::is_parent_object($Current_DN)){
+
+ /* This is a child object; check that the parent object is not
+ marked as removed */
+ $cow_parent_dn = FAI::get_parent_object($Current_DN, false);
+ if ($cow_parent_dn && !FAI::parent_is_removed($Current_DN)){
+
+ /* This is a child object, check whether the parent object in
+ the main release exists */
+ $main_parent_dn = FAI::get_parent_release_object($cow_parent_dn);
+ $ldap = $config->get_ldap_link();
+ $ldap->cd($config->current['BASE']);
+ $ldap->cat($main_parent_dn);
+ if($ldap->count()){
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
+ static function get_leaf_objects($dn, $cn, $subclass, $rdn) {
+ $valid_releases = FAI::get_previous_releases_of_this_release(FAI::get_release_dn($dn), true);
+ /* Remove the last release DN */
+ array_pop($valid_releases);
+ $valid_releases[] = FAI::get_release_dn($dn);
+
+ $objects = FAI::get_all_objects_for_given_base($dn,"(&(objectClass=FAIclass)(objectClass=".$subclass."))");
+ $res = array();
+ /* Strip elements which are not a leaf object of the current dn */
+ foreach($objects as $obj){
+ $keep = FALSE;
+ foreach($valid_releases as $valid_release) {
+ if (preg_match("/cn=".$cn.",".$rdn.$valid_release."$/", $obj['dn'])) {
+ $keep = TRUE;
+ break;
+ }
+ }
+
+ if ($keep) {
+ $res[] = $obj;
+ }
+ }
+
+ return $res;
+ }
+
+
}