Updated opsi clinet handling.

[gosa.git] / gosa-plugins / systems / admin / systems / class_servGeneric.inc

diff --git a/gosa-plugins/systems/admin/systems/class_servGeneric.inc b/gosa-plugins/systems/admin/systems/class_servGeneric.inc
index cc451e00662f2ec79855955c178697e004c535b0..c52153441db85ea360fdfdd9ce7e70cbd6fef07e 100644 (file)
--- a/gosa-plugins/systems/admin/systems/class_servGeneric.inc
+++ b/gosa-plugins/systems/admin/systems/class_servGeneric.inc
@@ -45,7 +45,7 @@ class servgeneric extends plugin
   var $modes = array();
   var $ui   ;
   var $validActions   = array("reboot" => "", "update" => "", "localboot" => "", "reinstall" => "", "rescan" => "",
-                            "wake" => "", "memcheck" => "", "sysinfo" => "");
+                            "wakeup" => "", "memcheck" => "", "sysinfo" => "");
 
   var $fai_activated  =FALSE;
   var $view_logged = FALSE;
@@ -53,6 +53,19 @@ class servgeneric extends plugin
   var $currently_installing = FALSE;
   var $currently_installing_warned = FALSE;
 
+  var $kerberos_key_service = NULL;
+
+  var $mapActions   = array("reboot"          => "",
+                            "instant_update"  => "softupdate",
+                            "localboot"       => "localboot",
+                            "update"          => "sceduledupdate",
+                            "reinstall"       => "install",
+                            "rescan"          => "",
+                            "wakeup"            => "",
+                            "memcheck"        => "memcheck",
+                            "sysinfo"         => "sysinfo");
+
+
   function servgeneric (&$config, $dn= NULL, $parent= NULL)
   {
     /* Check if FAI is activated */
@@ -64,6 +77,11 @@ class servgeneric extends plugin
 
     plugin::plugin ($config, $dn, $parent);
 
+    /* Initialize kerberos host key plugin */
+    if(class_available("krbHostKeys")){
+      $this->kerberos_key_service = new krbHostKeys($this->config,$this);
+    }
+
     $this->ui = get_userinfo();
     $this->modes["active"]= _("Activated");
     $this->modes["locked"]= _("Locked");
@@ -81,7 +99,7 @@ class servgeneric extends plugin
     $this->netConfigDNS->set_acl_base($this->base);
 
     /* Check if this host is currently in installation process*/
-    if(class_available("gosaSupportDaemon") && class_available("DaemonEvent")){
+    if($this->dn != "new" && class_available("gosaSupportDaemon") && class_available("DaemonEvent")){
       $o = new gosaSupportDaemon();
       $e_types = DaemonEvent::get_event_types(USER_EVENT | SYSTEM_EVENT | HIDDEN_EVENT);
       $evts = $o->get_entries_by_mac(array($this->netConfigDNS->macAddress));
@@ -212,7 +230,7 @@ class servgeneric extends plugin
                                        "localboot" => _("Force localboot"),
                                        "sysinfo"  => _("System analysis")));
     } else {
-      $smarty->assign("actions", array("wake" => _("Wake up"),
+      $smarty->assign("actions", array("wakeup" => _("Wake up"),
                                        "reinstall" => _("Reinstall"),
                                        "update" => _("System update"),
                                        "memcheck" => _("Memory test"),
@@ -231,6 +249,11 @@ class servgeneric extends plugin
     $smarty->assign("modes", $this->modes);
     $smarty->assign("currently_installing", $this->currently_installing);
 
+    $smarty->assign("host_key","");
+    if(is_object($this->kerberos_key_service)){
+      $smarty->assign("host_key",$this->kerberos_key_service->execute_by_prefix("host/"));
+    }
+
     return($smarty->fetch (get_template_path('server.tpl', TRUE)));
   }
 
@@ -241,6 +264,11 @@ class servgeneric extends plugin
       return;
     }
 
+    /* Remove kerberos key dependencies too */
+    if(is_object($this->kerberos_key_service)){
+      $this->kerberos_key_service->remove_from_parent_by_prefix("host/");
+    }
+
     $this->netConfigDNS->remove_from_parent();
     $ldap= $this->config->get_ldap_link();
     $ldap->rmdir($this->dn);
@@ -290,6 +318,11 @@ class servgeneric extends plugin
         $this->base = $base_tmp;
       }
     }
+
+    /* Hanle kerberos host key plugin */
+    if(is_object($this->kerberos_key_service)){
+      $this->kerberos_key_service->save_object_by_prefix("host/");
+    }
   }
 
 
@@ -342,7 +375,7 @@ class servgeneric extends plugin
      */
     if($this->orig_dn == "new" && !$this->acl_is_createable($this->base)){
       $message[] = msgPool::permCreate();
-    }elseif($this->cn != $this->orig_cn || $this->base != $this->orig_base && !$this->acl_is_moveable($this->base)){
+    }elseif($this->orig_dn != "new" && $this->base != $this->orig_base && !$this->acl_is_moveable($this->base)){
       $message[] = msgPool::permMove();
     }