X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=gosa-si%2Fgosa-si-server;h=c9cbfa3ad914dc5e27d0e074e5dce46e4846f66b;hb=80cffb3242742d45a7c9b79ecb6acda570c8f86f;hp=262d1afd1ec962e081b6a4ed155ffdecd60d5c73;hpb=efb5fda88f16498336c828d80a5fe21808dc2da9;p=gosa.git

diff --git a/gosa-si/gosa-si-server b/gosa-si/gosa-si-server
index 262d1afd1..c9cbfa3ad 100755
--- a/gosa-si/gosa-si-server
+++ b/gosa-si/gosa-si-server
@@ -86,6 +86,7 @@ our (%cfg_defaults, $log_file, $pid_file,
     $arp_activ, $gosa_unit_tag,
     $GosaPackages_key, $gosa_ip, $gosa_port, $gosa_timeout,
     $foreign_server_string, $server_domain, $ServerPackages_key, $foreign_servers_register_delay,
+    $wake_on_lan_passwd,
 );
 
 # additional variable which should be globaly accessable
@@ -230,6 +231,7 @@ my $max_children = 2;
     "ldap-admin-password"  => [\$ldap_admin_password, ""],
     "gosa-unit-tag"        => [\$gosa_unit_tag, ""],
     "max-clients"          => [\$max_clients, 10],
+    "wol-password"           => [\$wake_on_lan_passwd, ""],
     },
 "GOsaPackages" => {
     "ip" => [\$gosa_ip, "0.0.0.0"],
@@ -537,7 +539,7 @@ sub check_key_and_xml_validity {
 
 
 sub check_outgoing_xml_validity {
-    my ($msg) = @_;
+    my ($msg, $session_id) = @_;
 
     my $msg_hash;
     eval{
@@ -590,8 +592,8 @@ sub check_outgoing_xml_validity {
         }
     };
     if($@) {
-        daemon_log("WARNING: outgoing msg is not gosa-si envelope conform", 5);
-        daemon_log("$@ ".(defined($msg) && length($msg)>0)?$msg:"Empty Message", 8);
+        daemon_log("$session_id WARNING: outgoing msg is not gosa-si envelope conform: ", 5);
+        daemon_log("$@ ".(defined($msg) && length($msg)>0)?$msg:"Empty Message", 5);
         $msg_hash = undef;
     }
 
@@ -1173,7 +1175,9 @@ sub msg_to_decrypt {
             $sql = "SELECT * FROM $foreign_clients_tn WHERE (hostname='$target' OR macaddress LIKE '$target')";
             $res = $foreign_clients_db->select_dbentry($sql);
             if (keys(%$res) > 0) {
-                my $hostname = $res->{1}->{'hostname'};
+		    my $hostname = $res->{1}->{'hostname'};
+		    my ($host_ip, $host_port) = split(/:/, $hostname);
+		    my $local_address =  &get_local_ip_for_remote_ip($host_ip).":$server_port";
                 my $regserver = $res->{1}->{'regserver'};
                 my $sql = "SELECT * FROM $known_server_tn WHERE hostname='$regserver'"; 
                 my $res = $known_server_db->select_dbentry($sql);
@@ -1346,7 +1350,7 @@ sub process_task {
 
         foreach my $answer ( @{$answer_l} ) {
             # check outgoing msg to xml validity
-            my $answer_hash = &check_outgoing_xml_validity($answer);
+            my $answer_hash = &check_outgoing_xml_validity($answer, $session_id);
             if( not defined $answer_hash ) { next; }
             
             $answer_header = @{$answer_hash->{'header'}}[0];
@@ -1459,7 +1463,7 @@ sub session_start {
 	$kernel->yield('create_fai_release_db', $fai_release_tn );
     $kernel->yield('watch_for_next_tasks');
 	$kernel->sig(USR1 => "sig_handler");
-	$kernel->sig(USR2 => "create_packages_list_db");
+	$kernel->sig(USR2 => "recreate_packages_db");
 	$kernel->delay_set('watch_for_new_jobs', $job_queue_loop_delay);
 	$kernel->delay_set('watch_for_done_jobs', $job_queue_loop_delay); 
 	$kernel->delay_set('watch_for_new_messages', $messaging_db_loop_delay);
@@ -2002,6 +2006,16 @@ sub change_goto_state {
 }
 
 
+sub run_recreate_packages_db {
+    my ($kernel, $session, $heap) = @_[KERNEL, SESSION, HEAP];
+    my $session_id = $session->ID;
+	&main::daemon_log("$session_id INFO: Recreating FAI Packages DB ('$fai_release_tn', '$fai_server_tn', '$packages_list_tn')", 4);
+	$kernel->yield('create_fai_release_db');
+	$kernel->yield('create_fai_server_db');
+	return;
+}
+
+
 sub run_create_fai_server_db {
     my ($kernel, $session, $heap, $table_name) = @_[KERNEL, SESSION, HEAP, ARG0];
     my $session_id = $session->ID;
@@ -2972,11 +2986,8 @@ daemon_log("0 INFO: found foreign server in config file and DNS: $all_foreign_se
 my $act_timestamp = &get_time();
 foreach my $foreign_server (@foreign_server_list) {
 
-	#######################################
-	# TODO for jan
 	# do not add myself to known_server_db
-	# work around!!!
-	if ($foreign_server eq '172.16.2.89:20081') { next; }
+	if (&is_local($foreign_server)) { next; }
 	######################################
 
     my $res = $known_server_db->add_dbentry( {table=>$known_server_tn, 
@@ -3030,6 +3041,7 @@ POE::Session->create(
         create_packages_list_db => \&run_create_packages_list_db,
         create_fai_server_db => \&run_create_fai_server_db,
         create_fai_release_db => \&run_create_fai_release_db,
+		recreate_packages_db => \&run_recreate_packages_db,
         session_run_result => \&session_run_result,
         session_run_debug => \&session_run_debug,
         session_run_done => \&session_run_done,