bugfix: multiple declaration of $next_msg

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

diff --git a/gosa-si/gosa-si-server b/gosa-si/gosa-si-server
index fa9d32aec67991915cb411f89ef802227893c3b4..07d1aadf5f94858f1c38d33854ebb01f43eb3153 100755 (executable)
--- a/gosa-si/gosa-si-server
+++ b/gosa-si/gosa-si-server
@@ -1101,9 +1101,9 @@ sub msg_to_decrypt {
        my ($msg, $msg_hash, $module);
        my $error = 0;
 
-       # hole neue msg aus @msgs_to_decrypt
-       my $next_msg = shift @msgs_to_decrypt;
-    my ($next_msg, $msg_source) = split(/;/, $next_msg);
+       # fetch new msg out of @msgs_to_decrypt
+       my $tmp_next_msg = shift @msgs_to_decrypt;
+    my ($next_msg, $msg_source) = split(/;/, $tmp_next_msg);
 
        # msg is from a new client or gosa
        ($msg, $msg_hash, $module) = &input_from_unknown_host($next_msg, $session_id);

diff --git a/gosa-si/tests/client.php b/gosa-si/tests/client.php
index 8b879a2a045a251f472acef1629eed0965b6ca9e..56206507d230d2b0a2f5963246e9a7bdd33a72fc 100755 (executable)
--- a/gosa-si/tests/client.php
+++ b/gosa-si/tests/client.php
@@ -78,6 +78,7 @@ for($count = 1; $count <= $zahl; $count++)
 
     # List all si-server providing opsi
     #$data = "<xml> <header>gosa_get_hosts_with_module</header> <source>GOSA</source> <target>10.89.1.31:20081</target> <module_name>mailqueue_com</module_name> </xml>";
+    $data = "<xml> <header>gosa_get_hosts_with_module</header> <source>GOSA</source> <target>linux-cl-2:20081</target> <module_name>mailqueue_com</module_name> </xml>";
 
     # Send messages to a user and displayed message via konch
     #$data = "<xml> <header>gosa_send_user_msg</header> <target>GOSA</target> <source>GOSA</source> <subject>".base64_encode("eine wichtige nachricht")."</subject> <from>admin</from>  <user>polle</user> <user>harald</user> <delivery_time>20130101235959</delivery_time> <message>".base64_encode("kaffeepause")."</message> </xml>"; 
@@ -124,7 +125,7 @@ for($count = 1; $count <= $zahl; $count++)
     # Opsi testing
 
     # Get all netboot products
-    $data = "<xml> <header>gosa_opsi_get_netboot_products</header> <source>GOSA</source> <target>GOSA</target> </xml>";
+    #$data = "<xml> <header>gosa_opsi_get_netboot_products</header> <source>GOSA</source> <target>GOSA</target> </xml>";
 
     # Get netboot product for specific host
     #$data = "<xml> <header>gosa_opsi_get_netboot_products</header> <source>GOSA</source> <target>GOSA</target> <hostId>linux-cl-2.intranet.gonicus.de</hostId></xml>";
@@ -214,6 +215,9 @@ for($count = 1; $count <= $zahl; $count++)
     # SYSLOG reload
     #$data = "<xml> <header>gosa_trigger_reload_syslog_config</header> <source>GOSA</source> <target>GOSA</target> <macaddress>00:01:6c:9d:b9:fa</macaddress> </xml>"; 
 
+
+
+
     $sock->write($data);
     $answer = "nothing";
     $answer = $sock->read();