Fixed some typos

[gosa.git] / gosa-si / modules / GosaPackages.pm

diff --git a/gosa-si/modules/GosaPackages.pm b/gosa-si/modules/GosaPackages.pm
index 7c396167db8d2bb95af7705a0af6d73f5e8e6c70..b1d207f74230360b0d448b5f7e15db38d32439fb 100644 (file)
--- a/gosa-si/modules/GosaPackages.pm
+++ b/gosa-si/modules/GosaPackages.pm
@@ -229,8 +229,8 @@ sub import_events {
 
     while (defined (my $event = readdir (DIR))) {
         if( $event eq "." || $event eq ".." ) { next; }   
-        if( $event eq "siTriggered.pm" ) { next; }      # SI specific events not needed in GosaPackages.pm
-        if( $event eq "clMessages.pm" ) { next; }                    # SI specific events not needed in GosaPackages.pm
+        if( $event eq "siTriggered.pm" ) { next; }                  # SI specific events not needed in GosaPackages.pm
+        if( $event eq "clMessages.pm" ) { next; }                   # SI specific events not needed in GosaPackages.pm
 
         eval{ require $event; };
         if( $@ ) {
@@ -246,7 +246,7 @@ sub import_events {
             $event_hash->{$event_name} = $event_module;
         }
         my $events_string = join( ", ", @{$events_l});
-        &main::daemon_log("G DEBUG: GosaPackages imported events $events_string", 8);
+        &main::daemon_log("G DEBUG: GosaPackages from '$1' imported events $events_string", 8);
     }
 }
 
@@ -276,16 +276,6 @@ sub process_incoming_msg {
     }
 
     foreach my $out_msg ( @msg_l ) {
-
-#        # keep job queue up-to-date and save result and status
-#        if (defined ($out_msg) && $out_msg =~ /<jobdb_id>(\d+)<\/jobdb_id>/) {
-#            my $job_id = $1;
-#            my $sql = "UPDATE '".$main::job_queue_tn."'".
-#                " SET status='processing'".
-#                " WHERE id='$job_id'";
-#            my $res = $main::job_db->exec_statement($sql);
-#        } 
-
         # substitute in all outgoing msg <source>GOSA</source> of <source>$server_address</source>
         $out_msg =~ s/<source>GOSA<\/source>/<source>$server_address<\/source>/g;
         $out_msg =~ s/<\/xml>/<session_id>$session_id<\/session_id><\/xml>/;
@@ -314,17 +304,6 @@ sub process_gosa_msg {
         @out_msg_l = &{$event_hash->{$header}."::$header"}($msg, $msg_hash, $session_id);
     }
 
-    # if incoming 'gosa_'-msg is scheduled from job_queue, than it contains xml-tag 'jobdb_id'
-    # after procesing this msg, set status of this job in job_queue to done
-#    if ($msg =~ /<jobdb_id>(\d+)<\/jobdb_id>/) {
-#        my $sql_statement = "UPDATE $main::job_queue_tn ".
-#            "SET status='done' ".
-#            "WHERE id='$1'";
-#        &main::daemon_log("DEBUG: $sql_statement", 7);         
-#        my $res = $main::job_db->update_dbentry($sql_statement);
-#        &main::daemon_log("INFO: set job '$1' to status 'done'", 5); 
-#    }
-
     # if delivery not possible raise error and return 
     if( not defined $out_msg_l[0] ) {
 #        &main::daemon_log("WARNING: GosaPackages got no answer from event handler '$header'", 3);
@@ -369,8 +348,28 @@ sub process_job_msg {
             "</xml>";
     }
     
-    # check wether mac address is already known in known_daemons or known_clients
-    my $target = 'none';
+       # if mac address is already known in ldap, set targettag to 'cn'
+    my $target;
+       my $ldap_handle = &main::get_ldap_handle($session_id); 
+       if( not defined $ldap_handle ) {
+               &main::daemon_log("$session_id ERROR: cannot connect to ldap", 1);
+               $target = "none"; 
+               
+       # try to fetch a 'real name'            
+       } else {
+               my $mesg = $ldap_handle->search(
+                                               base => $main::ldap_base,
+                                               scope => 'sub',
+                                               attrs => ['cn'],
+                                               filter => "(macAddress=$macaddress)");
+               if($mesg->code) {
+                       &main::daemon_log($mesg->error, 1);
+                       $target = "none";
+               } else {
+                       my $entry= $mesg->entry(0);
+                       $target = $entry->get_value("cn");
+               }
+       }
 
     if( $error == 0 ) {
         # add job to job queue