bugfix: correct update of FAIstate by CLMSG_TASKBEGIN finish and faiend

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

diff --git a/gosa-si/gosa-si-server b/gosa-si/gosa-si-server
index 08ce86f68b98231c54af828b5d47924f23b46a95..d403d37202c4b1a5c13c4a26ae7f13d5c2de9e59 100755 (executable)
--- a/gosa-si/gosa-si-server
+++ b/gosa-si/gosa-si-server
@@ -1343,7 +1343,6 @@ sub change_fai_state {
           filter => "$search"
           );
 
-#print STDERR "=============================================\n$search\n"; 
       if ($mesg->count) {
         my @entries = $mesg->entries;
         foreach my $entry (@entries) {

diff --git a/gosa-si/server/events/clMessages.pm b/gosa-si/server/events/clMessages.pm
index 9998ed1afb0da11d53cd1b737b3e32ad8c6e28a5..3415ea14c0ea083d55d05a5003e84c7c9adb4823 100644 (file)
--- a/gosa-si/server/events/clMessages.pm
+++ b/gosa-si/server/events/clMessages.pm
@@ -165,14 +165,16 @@ sub CURRENTLY_LOGGED_IN {
     my $source = @{$msg_hash->{'source'}}[0];
     my $login = @{$msg_hash->{$header}}[0];
 
+    # fetch all user currently assigned to the client at login_users_db
+    my %currently_logged_in_user = (); 
     $sql_statement = "SELECT * FROM $main::login_users_tn WHERE client='$source'"; 
     $db_res = $main::login_users_db->select_dbentry($sql_statement);
-    my %currently_logged_in_user = (); 
     while( my($hit_id, $hit) = each(%{$db_res}) ) {
         $currently_logged_in_user{$hit->{'user'}} = 1;
     }
     &main::daemon_log("$session_id DEBUG: logged in users from login_user_db: ".join(", ", keys(%currently_logged_in_user)), 7); 
 
+    # 
     my @logged_in_user = split(/\s+/, $login);
     &main::daemon_log("$session_id DEBUG: logged in users reported from client: ".join(", ", @logged_in_user), 7); 
     foreach my $user (@logged_in_user) {
@@ -330,7 +332,7 @@ sub TASKBEGIN {
         &main::daemon_log("$session_id INFO: $header at '$macaddress' - '$content'", 5); 
         
         # set fai_state to localboot
-        &main::change_fai_state('localboot', \@{$msg_hash->{target}}, $session_id);
+        &main::change_fai_state('localboot', \@{$msg_hash->{'macaddress'}}, $session_id);
 
     } else {
         my $sql_statement = "UPDATE $main::job_queue_tn ".

diff --git a/gosa-si/tests/client.php b/gosa-si/tests/client.php
index 36bf5390bdd2f8174c8437ab53cde565d782f2aa..6bf855f1626d239addabb2b478eeed0d17e9b698 100755 (executable)
--- a/gosa-si/tests/client.php
+++ b/gosa-si/tests/client.php
@@ -18,7 +18,7 @@ if($sock->connected()){
 # jobdb add
 #$data = "<xml> <header>gosa_network_completition</header> <source>GOSA</source><target>GOSA</target><hostname>ws-muc-2</hostname></xml>";
 #$data = "<xml> <header>job_sayHello</header> <source>10.89.1.155:20083</source><mac>00:1B:77:04:8A:6C</mac> <timestamp>20130102133900</timestamp> </xml>";
-$data = "<xml> <header>job_ping</header> <source>GOSA</source> <target>00:01:6c:9d:b9:fa</target> <macaddress>00:01:6c:9d:b9:fa</macaddress><timestamp>19700101000000</timestamp> </xml>";
+#$data = "<xml> <header>job_ping</header> <source>GOSA</source> <target>00:01:6c:9d:b9:fa</target> <macaddress>00:01:6c:9d:b9:fa</macaddress><timestamp>19700101000000</timestamp> </xml>";
 
 
 # jobdb delete
@@ -58,7 +58,7 @@ $data = "<xml> <header>job_ping</header> <source>GOSA</source> <target>00:01:6c:
 #$data = "<xml> <header>gosa_new_key_for_client</header> <target>00:01:6c:9d:b9:fa</target> <source>10.89.1.31:20081</source> </xml>";
 #$data = "<xml> <header>job_trigger_action_wake</header> <target>00:01:6c:9d:b9:fa</target> <source>GOSA</source> <timestamp>19700101000000</timestamp></xml>";
 #$data = "<xml> <header>gosa_trigger_action_faireboot</header> <target>00:01:6c:9d:b9:fa</target> <source>GOSA</source> </xml>";
-#$data = "<xml> <header>job_trigger_action_reinstall</header> <source>GOSA</source> <target>00:01:6c:9d:b9:fa</target> <macaddress>00:01:6c:9d:b9:fa</macaddress> <timestamp>19700101000000</timestamp> </xml>";
+$data = "<xml> <header>job_trigger_action_reinstall</header> <source>GOSA</source> <target>00:01:6c:9d:b9:fa</target> <macaddress>00:01:6c:9d:b9:fa</macaddress> <timestamp>19700101000000</timestamp> </xml>";
 #$data = "<xml> <header>job_trigger_action_instant_update</header> <target>00:01:6c:9d:b9:fa</target> <source>GOSA</source> <timestamp>19700101000000</timestamp> </xml>";
 #$data = "<xml> <header>gosa_ping</header> <target>00:01:6c:9d:b9:fa</target> <source>GOSA</source> </xml>";