diff --git a/gosa-plugins/goto/admin/systems/goto/class_terminalGeneric.inc b/gosa-plugins/goto/admin/systems/goto/class_terminalGeneric.inc
index e658ffe9c7671dbf511b9df68e8449640b1faaa5..08565d4d76ae74a09efc36026edee2350828b321 100644 (file)
var $cn= "";
var $description= "";
var $orig_dn= "";
+ var $orig_cn= "";
+ var $orig_base= "";
var $inheritTimeServer = true;
var $member_of_ogroup = FALSE;
+ var $kerberos_key_service = NULL;
+
+
function termgeneric (&$config, $dn= NULL, $parent= NULL)
{
/* Check if FAI is activated */
plugin::plugin ($config, $dn, $parent);
+ if(class_available("krb_host_keys")){
+ $this->kerberos_key_service = new krb_host_keys($this->config,$this);
+ }
+
if(!isset($this->parent->by_object['ogroup'])){
$ldap = $this->config->get_ldap_link();
$ldap->cd ($this->config->current['BASE']);
$this->gotoNtpServer= array();
if(isset($this->attrs['gotoNtpServer'])){
$this->inheritTimeServer = false;
- unset($this->attrs['gotoNtpServer']['count']);
- foreach($this->attrs['gotoNtpServer'] as $server){
+ for($i = 0 ; $i < $this->attrs['gotoNtpServer']['count']; $i++ ){
+ $server = $this->attrs['gotoNtpServer'][$i];
$this->gotoNtpServer[$server] = $server;
}
}
$ui= get_userinfo();
$this->base= dn2base($ui->dn);
} else {
- $this->base= preg_replace ("/^[^,]+,[^,]+,[^,]+,/", "", $this->dn);
+ $this->base= preg_replace ("/^[^,]+,".normalizePreg(get_ou("terminalou"))."/", "", $this->dn);
}
/* Create an array of all Syslog servers */
}
$this->orig_dn= $this->dn;
+ $this->orig_cn= $this->cn;
+ $this->orig_base= $this->base;
}
function set_acl_base($base)
/* Do we represent a valid terminal? */
if (!$this->is_account && $this->parent === NULL){
- $display= "<img alt=\"\" src=\"images/stop.png\" align=middle> <b>".
+ $display= "<img alt=\"\" src=\"images/small-error.png\" align=middle> <b>".
msgPool::noValidExtension(_("terminal"))."</b>";
return($display);
}
return($str);
}
$smarty->assign("netconfig", $str);
+
+ /* Display kerberos host key options */
+ $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('terminal.tpl', TRUE, dirname(__FILE__))));
}
msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $this->dn, LDAP_DEL, get_class()));
}
+ /* Remove kerberos key dependencies too */
+ if(is_object($this->kerberos_key_service)){
+ $this->kerberos_key_service->remove_from_parent_by_prefix("host/");
+ }
+
/* Optionally execute a command after we're done */
$this->handle_post_events("remove",array("macAddress" => $this->netConfigDNS->macAddress,"ipHostNumber" => $this->netConfigDNS->ipHostNumber));
unset($og->member[$this->dn]);
$og->save ();
}
+
+ /* Remove all accessTo/trust dependencies */
+ update_accessTo($this->cn,"");
}
/* Clean queue form entries with this mac
$this->set_everything_to_inherited();
}
+ /* Hanle kerberos host key plugin */
+ if(is_object($this->kerberos_key_service)){
+ $this->kerberos_key_service->save_object_by_prefix("host/");
+ }
}
$message[]= msgPool::required(_("NTP server"));
}
+ /* Check if we are allowed to create or move this object
+ */
+ if($this->orig_dn == "new" && !$this->acl_is_createable($this->base)){
+ $message[] = msgPool::permCreate();
+ }elseif($this->orig_dn != "new" && $this->base != $this->orig_base && !$this->acl_is_moveable($this->base)){
+ $message[] = msgPool::permMove();
+ }
+
return ($message);
}
/* Save to LDAP */
function save()
{
-
- /* Move object if requested */
- if( $this->orig_dn != 'new' && $this->dn != $this->orig_dn){
- $this->move($this->orig_dn, $this->dn);
- }
-
/* Detect mode changes */
$activate= (isset($this->saved_attributes['gotoMode']) &&
$this->gotoMode != $this->saved_attributes['gotoMode'] &&
$ldap->modify ($this->attrs);
new log("modify","terminal/".get_class($this),$this->dn,array_keys($this->attrs),$ldap->get_error());
$this->handle_post_events("modify",array("macAddress" => $this->netConfigDNS->macAddress,"ipHostNumber" => $this->netConfigDNS->ipHostNumber));
+
+ /* Update all accessTo/trust dependencies */
+ if($this->orig_cn != $this->cn){
+ update_accessTo($this->orig_cn,$this->cn);
+ }
}
/* cn=default and macAddress=- indicates that this is a template */