From: rettenbe <rettenbe@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 6 Aug 2008 14:04:09 +0000 (+0000)
Subject: bugfix: opsi_add_product_to_client, callobj with correct param sequence
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=fa6a97eccfb2a0e1513945b76341d3977a83b609;p=gosa.git

bugfix: opsi_add_product_to_client, callobj with correct param sequence


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

diff --git a/gosa-si/server/events/opsi_com.pm b/gosa-si/server/events/opsi_com.pm
index e7810d57e..329b192d9 100644
--- a/gosa-si/server/events/opsi_com.pm
+++ b/gosa-si/server/events/opsi_com.pm
@@ -73,7 +73,6 @@ sub opsi_add_product_to_client {
     params  => [ $productId, $hostId, "setup" ],
     id  => 1, }; 
 
-
   my $sres = $main::opsi_client->call($main::opsi_url, $callobj);
   my ($sres_err, $sres_err_string) = &check_opsi_res($sres);
   if ($sres_err){
@@ -189,7 +188,7 @@ sub opsi_add_client {
   my $name= $hostId;
   $name=~ s/^([^.]+).*$/$1/;
   my $domain= $hostId;
-  $domain=~ s/^[^.]+(.*)$/$1/;
+  $domain=~ s/^[^.]+\.(.*)$/$1/;
   my ($description, $notes, $ip, $mac);
 
   if (defined @{$msg_hash->{'description'}}[0]){
diff --git a/gosa-si/tests/client.php b/gosa-si/tests/client.php
index 58202293c..c36cca351 100755
--- a/gosa-si/tests/client.php
+++ b/gosa-si/tests/client.php
@@ -157,13 +157,13 @@ for($count = 1; $count <= $zahl; $count++)
     #$data = "<xml> <header>job_opsi_install_client</header> <source>GOSA</source> <target>00:01:6c:9d:b9:fa</target> <hostId>limux-cl-2.intranet.gonicus.de</hostId> <macaddress>00:11:25:4b:8c:e5</macaddress> </xml>";
 
     # Add Opsi client
-    #$data = "<xml> <header>gosa_opsi_add_client</header> <source>GOSA</source> <target>00:01:6c:9d:b9:fa</target> <hostId>limux-cl-1.intranet.gonicus.de</hostId> <macaddress>00:11:25:4b:8c:e6</macaddress> <description>Test halt</description> </xml>";
+    $data = "<xml> <header>gosa_opsi_add_client</header> <source>GOSA</source> <target>00:01:6c:9d:b9:fa</target> <hostId>limux-cl-1.intranet.gonicus.de</hostId> <macaddress>00:11:25:4b:8c:e6</macaddress> <description>Test halt</description> </xml>";
 
     # Add product to Opsi client
-    $data = "<xml> <header>gosa_opsi_add_product_to_client</header> <source>GOSA</source> <target>00:01:6c:9d:b9:fa</target> <hostId>limux-cl-1.intranet.gonicus.de</hostId> <macaddress>00:11:25:4b:8c:e6</macaddress> <productId>winxppro</productId>  </xml>";
+    $data = "<xml> <header>gosa_opsi_add_product_to_client</header> <source>GOSA</source> <target>00:01:6c:9d:b9:fa</target> <hostId>limux-cl-1.intranet.gonicus.de</hostId> <macaddress>00:11:25:4b:8c:e6</macaddress> <productId>firefox</productId>  </xml>";
 
     # Delete product from Opsi client
-    $data = "<xml> <header>gosa_opsi_del_product_from_client</header> <source>GOSA</source> <target>00:01:6c:9d:b9:fa</target> <hostId>limux-cl-1.intranet.gonicus.de</hostId> <macaddress>00:11:25:4b:8c:e6</macaddress> <productId>winxppro</productId>  </xml>";
+    #$data = "<xml> <header>gosa_opsi_del_product_from_client</header> <source>GOSA</source> <target>00:01:6c:9d:b9:fa</target> <hostId>limux-cl-1.intranet.gonicus.de</hostId> <macaddress>00:11:25:4b:8c:e6</macaddress> <productId>winxppro</productId>  </xml>";
 
     #########################
     # Mailqueue communication