* fixes opsi problem, callobject get_netboot_products does not come back and so no...

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

diff --git a/gosa-si/server/events/opsi_com.pm b/gosa-si/server/events/opsi_com.pm
index 989a88e154fffe2de10f8c02efb990dcb3b9d485..957b7e67fe21f421a34524d504e5a471b9f7e472 100644 (file)
--- a/gosa-si/server/events/opsi_com.pm
+++ b/gosa-si/server/events/opsi_com.pm
@@ -426,12 +426,11 @@ sub opsi_get_netboot_products {
         params  => [ ],
         id  => 1,
     };
-
     &main::daemon_log("$session_id DEBUG: send callobj to opsi_client: ".&opsi_callobj2string($callobj), 7);
     &main::daemon_log("$session_id DEBUG: opsi_url $main::opsi_url", 7);
     &main::daemon_log("$session_id DEBUG: waiting for answer from opsi_client!", 7);
     my $res = $main::opsi_client->call($main::opsi_url, $callobj);
-    &main::daemon_log("$session_id DEBUG: get answer from opsi_client with number of entries: ".length(@$res), 7);
+    &main::daemon_log("$session_id DEBUG: get answer from opsi_client", 7);
     my %r = ();
     for (@{$res->result}) { $r{$_} = 1 }
 

diff --git a/gosa-si/tests/client.php b/gosa-si/tests/client.php
index 39b57d86f08f53a849afb2be7a7beb0652916301..8b879a2a045a251f472acef1629eed0965b6ca9e 100755 (executable)
--- a/gosa-si/tests/client.php
+++ b/gosa-si/tests/client.php
@@ -9,10 +9,10 @@ $zahl= 1;
 for($count = 1; $count <= $zahl; $count++)
 {
 
-  #$sock = new Socket_Client("127.0.0.1","20081",TRUE,5);
-  #$sock->setEncryptionKey("secret-gosa-password");
-  $sock = new Socket_Client("10.89.1.42","20081",TRUE,5);
+  $sock = new Socket_Client("127.0.0.1","20081",TRUE,5);
   $sock->setEncryptionKey("secret-gosa-password");
+  #$sock = new Socket_Client("10.89.1.42","20081",TRUE,5);
+  #$sock->setEncryptionKey("secret-gosa-password");
 
   if($sock->connected()){
 
@@ -84,7 +84,7 @@ for($count = 1; $count <= $zahl; $count++)
     #$data = "<xml> <header>gosa_send_user_msg</header> <target>10.89.1.30:20081</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>";
     #$data = "<xml> <header>gosa_send_user_msg</header> <target>10.89.1.30:20081</target> <source>GOSA</source> <subject>".base64_encode("eine wichtige nachricht")."</subject> <from>admin</from> <user>rettenbe</user> <delivery_time>20130101235959</delivery_time> <message>".base64_encode("kaffeepause")."</message> </xml>";
     
-    $data = "<xml> <header>gosa_set_last_system</header> <target>10.89.1.31:20082</target> <source>GOSA</source> <mac_address>00:01:6c:9d:b9:fa</mac_address> <last_system>1.2.3.4</last_system> <last_system_login>20081212000000</last_system_login> </xml>";
+    #$data = "<xml> <header>gosa_set_last_system</header> <target>10.89.1.31:20082</target> <source>GOSA</source> <mac_address>00:01:6c:9d:b9:fa</mac_address> <last_system>1.2.3.4</last_system> <last_system_login>20081212000000</last_system_login> </xml>";
 
     ##################
     # recreate fai dbs
@@ -124,7 +124,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,8 +214,6 @@ 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>"; 
 
-    $data ="<xml><header>gosa_krb5_get_policy</header><policy>6chars</policy><source>GOSA</source><target>00:01:6c:9d:aa:16</   target></xml>";
-
     $sock->write($data);
     $answer = "nothing";
     $answer = $sock->read();