bugfix: gosaTriggered.pm, softupdate do wol for local network too

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

diff --git a/gosa-si/server/events/clMessages.pm b/gosa-si/server/events/clMessages.pm
index 4ff3875be20f96ee8d2fc4888a00b242bb4231bd..47bb47c6306baa5c528c105945677ad48a808223 100644 (file)
--- a/gosa-si/server/events/clMessages.pm
+++ b/gosa-si/server/events/clMessages.pm
@@ -116,9 +116,11 @@ sub LOGIN {
     my $header = @{$msg_hash->{'header'}}[0];
     my $source = @{$msg_hash->{'source'}}[0];
     my $login = @{$msg_hash->{$header}}[0];
+    my $res;
+    my $error_str;
 
     # Invoke set_last_system
-       my $res = &set_last_system($msg, $msg_hash, $session_id);
+       $res = &set_last_system($msg, $msg_hash, $session_id);
 
     my %add_hash = ( table=>$main::login_users_tn, 
         primkey=> ['client', 'user'],
@@ -126,7 +128,7 @@ sub LOGIN {
         user=>$login,
         timestamp=>&get_time,
         ); 
-    my ($res, $error_str) = $main::login_users_db->add_dbentry( \%add_hash );
+    ($res, $error_str) = $main::login_users_db->add_dbentry( \%add_hash );
     if ($res != 0)  {
         &main::daemon_log("$session_id ERROR: cannot add entry to known_clients: $error_str");
         return;

diff --git a/gosa-si/server/events/gosaTriggered.pm b/gosa-si/server/events/gosaTriggered.pm
index 5fdd546e503b9749cc5526594bffb6a873308443..5e1a084781832123ab1698cb12e995ab80da9969 100644 (file)
--- a/gosa-si/server/events/gosaTriggered.pm
+++ b/gosa-si/server/events/gosaTriggered.pm
@@ -640,6 +640,9 @@ sub trigger_action_reinstall {
 
     my %data = ( 'macAddress'  => \@{$msg_hash->{macaddress}} );
     my $wake_msg = &build_msg("trigger_wake", "GOSA", "KNOWN_SERVER", \%data);
+    # invoke trigger wake for this gosa-si-server
+    &main::server_server_com::trigger_wake($msg, $msg_hash, $session_id);
+
     my @out_msg_l = ($wake_msg, $msg);  
     return @out_msg_l;
 }
@@ -653,6 +656,9 @@ sub trigger_action_update {
 
     my %data = ( 'macAddress'  => \@{$msg_hash->{macaddress}} );
     my $wake_msg = &build_msg("trigger_wake", "GOSA", "KNOWN_SERVER", \%data);
+    # invoke trigger wake for this gosa-si-server
+    &main::server_server_com::trigger_wake($msg, $msg_hash, $session_id);
+
     my @out_msg_l = ($wake_msg, $msg);  
     return @out_msg_l;
 }
@@ -671,8 +677,12 @@ sub trigger_action_instant_update {
         my $res = $main::job_db->exec_statement($sql_statement);
     }
 
+
     my %data = ( 'macAddress'  => \@{$msg_hash->{macaddress}} );
     my $wake_msg = &build_msg("trigger_wake", "GOSA", "KNOWN_SERVER", \%data);
+    # invoke trigger wake for this gosa-si-server
+    &main::server_server_com::trigger_wake($msg, $msg_hash, $session_id);
+
     my @out_msg_l = ($wake_msg, $msg);  
     return @out_msg_l;
 }