bugfix: use 'macaddress' notation in all wake_up relating messages

git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.6-lhm@12792 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-si/server/events/gosaTriggered.pm b/gosa-si/server/events/gosaTriggered.pm
index ddcd4aaacb649e99784232ad1fc265c152517893..3c8fbeef1db075a4192b846ad8f6c0589b93f26c 100644 (file)
--- a/gosa-si/server/events/gosaTriggered.pm
+++ b/gosa-si/server/events/gosaTriggered.pm
@@ -638,7 +638,7 @@ sub trigger_action_reinstall {
 
     &main::change_fai_state('reinstall', \@{$msg_hash->{macaddress}}, $session_id);
 
-    my %data = ( 'macAddress'  => \@{$msg_hash->{macaddress}} );
+    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); 
@@ -653,7 +653,7 @@ sub trigger_action_update {
 
     &main::change_fai_state('update', \@{$msg_hash->{macaddress}}, $session_id);
 
-    my %data = ( 'macAddress'  => \@{$msg_hash->{macaddress}} );
+    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); 
@@ -675,7 +675,7 @@ sub trigger_action_instant_update {
         my $res = $main::job_db->exec_statement($sql_statement);
     }
 
-    my %data = ( 'macAddress'  => \@{$msg_hash->{macaddress}} );
+    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);
@@ -747,8 +747,8 @@ sub trigger_action_wake {
 
     # build out message
     my $out_hash = &create_xml_hash("trigger_wake", "GOSA", "KNOWN_SERVER");
-    foreach (@{$msg_hash->{target}}) {
-        &add_content2xml_hash($out_hash, 'macAddress', $_);
+    foreach (@{$msg_hash->{macaddress}}) {
+        &add_content2xml_hash($out_hash, 'macaddress', $_);
     }
     my $out_msg = &create_xml_string($out_hash);
     

diff --git a/gosa-si/server/events/opsi_com.pm b/gosa-si/server/events/opsi_com.pm
index 3c62ab5ab40b45f4bbc7137bffba6465c1c90641..e42107ba9a1f61f3352164374ce06ca5a1c6f8f9 100644 (file)
--- a/gosa-si/server/events/opsi_com.pm
+++ b/gosa-si/server/events/opsi_com.pm
@@ -1231,7 +1231,7 @@ sub opsi_install_client {
     # Build wakeup message for client
         if (not $error) {
             my $wakeup_hash = &create_xml_hash("trigger_wake", "GOSA", "KNOWN_SERVER");
-            &add_content2xml_hash($wakeup_hash, 'macAddress', $macaddress);
+            &add_content2xml_hash($wakeup_hash, 'macaddress', $macaddress);
             my $wakeup_msg = &create_xml_string($wakeup_hash);
             push(@out_msg_l, $wakeup_msg);
 

diff --git a/gosa-si/server/events/server_server_com.pm b/gosa-si/server/events/server_server_com.pm
index 2fd0f7459c46968c3ce77b70992b862559655a86..4c85944d0732015b8e6a1ae7bbb35ad4cbaa127e 100644 (file)
--- a/gosa-si/server/events/server_server_com.pm
+++ b/gosa-si/server/events/server_server_com.pm
@@ -278,7 +278,7 @@ sub new_foreign_client {
 sub trigger_wake {
     my ($msg, $msg_hash, $session_id) = @_ ;
 
-    foreach (@{$msg_hash->{macAddress}}){
+    foreach (@{$msg_hash->{macaddress}}){
         &main::daemon_log("$session_id INFO: trigger wake for $_", 5);
         my $host    = $_;
         my $ipaddr  = '255.255.255.255';