Code

Move information to 90_gosa.conf
authorcajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Fri, 13 Nov 2009 14:21:14 +0000 (14:21 +0000)
committercajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Fri, 13 Nov 2009 14:21:14 +0000 (14:21 +0000)
git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@14811 594d385d-05f5-0310-b6e9-bd551577e9d8

gosa-si/server/events/opsi_com.pm

index 5e423d9ff1bd01ea626bffaf90cc2005d367910d..caeb22c614299f17dc99c8d18632a46b1e5d3aac 100644 (file)
@@ -870,10 +870,12 @@ sub opsi_list_clients {
         params  => [ ],
         id  => 1,
     };
+
     my $res = $main::opsi_client->call($main::opsi_url, $callobj);
     if (not &check_opsi_res($res)){
         foreach my $host (@{$res->result}){
             my $item= "\n<item><name>".$host->{'hostId'}."</name>";
+            $item.= "<mac>".xml_quote($host->{'macAddress'})."</mac>";
             if (defined($host->{'description'})){
                 $item.= "<description>".xml_quote($host->{'description'})."</description>";
             }
@@ -884,25 +886,6 @@ sub opsi_list_clients {
                 $item.= "<lastSeen>".xml_quote($host->{'lastSeen'})."</lastSeen>";
             }
 
-            $callobj = {
-              method  => 'getIpAddress',
-              params  => [ $host->{'hostId'} ],
-              id  => 1,
-            };
-            my $sres= $main::opsi_client->call($main::opsi_url, $callobj);
-            if ( not &check_opsi_res($sres)){
-              $item.= "<ip>".xml_quote($sres->result)."</ip>";
-            }
-
-            $callobj = {
-              method  => 'getMacAddress',
-              params  => [ $host->{'hostId'} ],
-              id  => 1,
-            };
-            $sres= $main::opsi_client->call($main::opsi_url, $callobj);
-            if ( not &check_opsi_res($sres)){
-                $item.= "<mac>".xml_quote($sres->result)."</mac>";
-            }
             $item.= "</item>";
             $xml_msg=~ s%<xxx></xxx>%$item<xxx></xxx>%;
         }