Updated server kerberos key handling

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@11254 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-plugins/systems/admin/systems/class_servGeneric.inc b/gosa-plugins/systems/admin/systems/class_servGeneric.inc
index dbda1c6706088b1e5a91b828ec23f686f28296c7..b09ce6fea26409fd4c1665990a063e46f620c6af 100644 (file)
--- a/gosa-plugins/systems/admin/systems/class_servGeneric.inc
+++ b/gosa-plugins/systems/admin/systems/class_servGeneric.inc
@@ -240,7 +240,7 @@ class servgeneric extends plugin
 
     $smarty->assign("host_key","");
     if(is_object($this->kerberos_key_service)){
-      $smarty->assign("host_key",$this->kerberos_key_service->execute());
+      $smarty->assign("host_key",$this->kerberos_key_service->execute_by_prefix("host/"));
     }
 
     return($smarty->fetch (get_template_path('server.tpl', TRUE)));
@@ -255,7 +255,7 @@ class servgeneric extends plugin
 
     /* Remove kerberos key dependencies too */
     if(is_object($this->kerberos_key_service)){
-      $this->kerberos_key_service->remove_from_parent();
+      $this->kerberos_key_service->remove_from_parent_by_prefix("host/");
     }
 
     $this->netConfigDNS->remove_from_parent();
@@ -310,7 +310,7 @@ class servgeneric extends plugin
 
     /* Hanle kerberos host key plugin */
     if(is_object($this->kerberos_key_service)){
-      $this->kerberos_key_service->save_object();
+      $this->kerberos_key_service->save_object_by_prefix("host/");
     }
   }
 

diff --git a/gosa-plugins/systems/admin/systems/class_serverService.inc b/gosa-plugins/systems/admin/systems/class_serverService.inc
index e65943a41264527db0141250b71b44f251576e77..668bd945f65a2be4a36ad8c2b5138cc320f74d30 100644 (file)
--- a/gosa-plugins/systems/admin/systems/class_serverService.inc
+++ b/gosa-plugins/systems/admin/systems/class_serverService.inc
@@ -69,8 +69,7 @@ class ServerService extends plugin
 
         /* Initialize kerberos key support */ 
         if(isset($this->plugins[$name]->krb_service_prefix) && !empty($this->plugins[$name]->krb_service_prefix)){
-          $this->plugins[$name]->krb_host_key = new krb_host_keys($this->config,$this->parent,$this->plugins[$name]->krb_service_prefix);
-          $this->plugins[$name]->krb_host_key->ServiceKey(TRUE);
+          $this->plugins[$name]->krb_host_key = &$this->parent->kerberos_key_service;
         }
 
         /* Capture all service objectClases, necessary for acl handling */ 
@@ -258,11 +257,10 @@ class ServerService extends plugin
 
     /* There is currently a subdialog open, display this dialog */
     if(is_object($this->dialog)){
-#      $this->dialog->save_object();
       $add ="";
       if(isset($this->dialog->krb_host_key) && $this->dialog->krb_host_key instanceof krb_host_keys){
-        $add = $this->dialog->krb_host_key->save_object();
-        $add = $this->dialog->krb_host_key->execute();
+        $add = $this->dialog->krb_host_key->save_object_by_prefix($this->dialog->krb_service_prefix);
+        $add = $this->dialog->krb_host_key->execute_by_prefix($this->dialog->krb_service_prefix,TRUE);
       }
       return($add.$this->dialog->execute());
     }
@@ -429,7 +427,7 @@ class ServerService extends plugin
       }
       if($this->plugins[$name]->initially_was_account){
         if(isset($this->plugins[$name]->krb_host_key) && $this->plugins[$name]->krb_host_key instanceof krb_host_keys){
-          $this->plugins[$name]->krb_host_key->remove_from_parent();
+          $this->plugins[$name]->krb_host_key->remove_from_parent_by_prefix($this->plugins[$name]->krb_host_key);
         }
         $this->plugins[$name]->remove_from_parent();
       }