bugfix: get opsi hosts reports correct local mac address

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

diff --git a/gosa-si/server/events/gosaTriggered.pm b/gosa-si/server/events/gosaTriggered.pm
index 1e3b3c4ead9250079e838ac5d71fca1516f12562..e18e0b4a7d8e105e5724511d928bf7c41d238ce6 100644 (file)
--- a/gosa-si/server/events/gosaTriggered.pm
+++ b/gosa-si/server/events/gosaTriggered.pm
@@ -1139,8 +1139,9 @@ sub get_hosts_with_module {
 
     # Check localhost for module_name
     if (exists @{$main::known_modules->{'GosaPackages'}}[2]->{$module_name}) {
-        my ($remote_ip, $remote_port) = split(/:/, $source);
-        my $local_mac = &get_local_mac_for_remote_ip($remote_ip);
+        my ($local_ip, $local_port) = split(/:/, $target);
+        my $network_interface= &get_interface_for_ip($local_ip);
+        my $local_mac = &get_mac_for_interface($network_interface);
         &add_content2xml_hash($out_hash, "host", $local_mac);
     }
 

diff --git a/gosa-si/tests/client.php b/gosa-si/tests/client.php
index cc509f5062547b9c9a02614aef0e1b934981695d..b9ebc4264419761358cf4b79553f051d8bd971a9 100755 (executable)
--- a/gosa-si/tests/client.php
+++ b/gosa-si/tests/client.php
@@ -77,7 +77,7 @@ for($count = 1; $count <= $zahl; $count++)
     #$data = "<xml> <header>gosa_get_client_for_login_usr</header> <target>GOSA</target> <source>GOSA</source> <usr>harald</usr></xml>";
 
     # List all si-server providing opsi
-    $data = "<xml> <header>gosa_get_hosts_with_module</header> <source>GOSA</source> <target>GOSA</target> <module_name>opsi_com</module_name> </xml>";
+    $data = "<xml> <header>gosa_get_hosts_with_module</header> <source>GOSA</source> <target>10.89.1.31:20081</target> <module_name>opsi_com</module_name> </xml>";
 
     ##################
     # recreate fai dbs
@@ -180,7 +180,7 @@ for($count = 1; $count <= $zahl; $count++)
 
     #########################
     # Mailqueue communication
-    #$data = "<xml> <header>gosa_mailqueue_query</header> <source>GOSA</source> <target>00:01:6c:9d:b9:fa</target> </xml>";
+    $data = "<xml> <header>gosa_mailqueue_query</header> <source>GOSA</source> <target>00:01:6c:9d:b9:fa</target> </xml>";
 
     # multiple xml tags msg_id are allowed
     #$data = "<xml> <header>gosa_mailqueue_hold</header> <source>GOSA</source> <target>00:01:6c:9d:b9:fa</target> <msg_id>99C8ABEF23</msg_id> </xml>";