Code

Buildroot was missing to create nice configs
[gosa.git] / gosa-si / gosa-si-server
index 54dfe3fd13082244b80e99cfc438b9374ce5ad9a..9f54c0088c3dfa36df4be20cf109e9b5bad5f549 100755 (executable)
@@ -48,16 +48,12 @@ use File::Basename;
 use File::Find;
 use File::Copy;
 use File::Path;
-use GOSA::DBsqlite;
 use GOSA::GosaSupportDaemon;
 use POE qw(Component::Server::TCP Wheel::Run Filter::Reference);
 use Net::LDAP;
 use Net::LDAP::Util qw(:escape);
 use Time::HiRes qw( usleep);
 
-my $modules_path = "/usr/lib/gosa-si/modules";
-use lib "/usr/lib/gosa-si/modules";
-
 # revision number of server and program name
 my $server_version = '$HeadURL: https://oss.gonicus.de/repositories/gosa/trunk/gosa-si/gosa-si-server $:$Rev: 10826 $';
 my $server_headURL;
@@ -65,6 +61,17 @@ my $server_revision;
 my $server_status;
 our $prg= basename($0);
 
+my $db_module = "DBsqlite";
+{
+no strict "refs";
+require ("GOSA/".$db_module.".pm");
+("GOSA/".$db_module)->import;
+daemon_log("0 INFO: importing database module '$db_module'", 1);
+}
+
+my $modules_path = "/usr/lib/gosa-si/modules";
+use lib "/usr/lib/gosa-si/modules";
+
 our $global_kernel;
 my ($foreground, $ping_timeout);
 my ($server);
@@ -100,6 +107,7 @@ our $verbose;
 our $forground;
 our $cfg_file;
 our ($ldap_uri, $ldap_base, $ldap_admin_dn, $ldap_admin_password, $ldap_server_dn);
+our ($mysql_username, $mysql_password, $mysql_database, $mysql_host);
 our $known_modules;
 our $root_uid;
 our $adm_gid;
@@ -123,88 +131,88 @@ my $watch_for_new_jobs_in_progress = 0;
 our $incoming_db;
 our $incoming_tn = 'incoming';
 my $incoming_file_name;
-my @incoming_col_names = ("id INTEGER PRIMARY KEY", 
-        "timestamp DEFAULT 'none'", 
-        "headertag DEFAULT 'none'",
-               "targettag DEFAULT 'none'",
-        "xmlmessage DEFAULT 'none'",
-        "module DEFAULT 'none'",
-        "sessionid DEFAULT '0'",
-        );
+my @incoming_col_names = ("id INTEGER PRIMARY KEY auto_increment",
+       "timestamp VARCHAR(14) DEFAULT 'none'", 
+       "headertag VARCHAR(255) DEFAULT 'none'",
+       "targettag VARCHAR(255) DEFAULT 'none'",
+       "xmlmessage TEXT",
+       "module VARCHAR(255) DEFAULT 'none'",
+       "sessionid VARCHAR(255) DEFAULT '0'",
+);
 
 # holds all gosa jobs
 our $job_db;
 our $job_queue_tn = 'jobs';
 my $job_queue_file_name;
-my @job_queue_col_names = ("id INTEGER PRIMARY KEY", 
-               "timestamp DEFAULT 'none'", 
-               "status DEFAULT 'none'", 
-               "result DEFAULT 'none'", 
-               "progress DEFAULT 'none'", 
-        "headertag DEFAULT 'none'", 
-               "targettag DEFAULT 'none'", 
-               "xmlmessage DEFAULT 'none'", 
-               "macaddress DEFAULT 'none'",
-               "plainname DEFAULT 'none'",
-        "siserver DEFAULT 'none'",
-        "modified DEFAULT '0'",
-               );
+my @job_queue_col_names = ("id INTEGER PRIMARY KEY auto_increment",
+       "timestamp VARCHAR(14) DEFAULT 'none'", 
+       "status VARCHAR(255) DEFAULT 'none'", 
+       "result TEXT",
+       "progress VARCHAR(255) DEFAULT 'none'",
+       "headertag VARCHAR(255) DEFAULT 'none'",
+       "targettag VARCHAR(255) DEFAULT 'none'", 
+       "xmlmessage TEXT", 
+       "macaddress VARCHAR(17) DEFAULT 'none'",
+       "plainname VARCHAR(255) DEFAULT 'none'",
+       "siserver VARCHAR(255) DEFAULT 'none'",
+       "modified INTEGER DEFAULT '0'",
+);
 
 # holds all other gosa-si-server
 our $known_server_db;
 our $known_server_tn = "known_server";
 my $known_server_file_name;
-my @known_server_col_names = ("hostname", "macaddress", "status", "hostkey", "loaded_modules", "timestamp");
+my @known_server_col_names = ("hostname VARCHAR(255)", "macaddress VARCHAR(17)", "status VARCHAR(255)", "hostkey VARCHAR(255)", "loaded_modules TEXT", "timestamp VARCHAR(14)");
 
 # holds all registrated clients
 our $known_clients_db;
 our $known_clients_tn = "known_clients";
 my $known_clients_file_name;
-my @known_clients_col_names = ("hostname", "status", "hostkey", "timestamp", "macaddress", "events", "keylifetime");
+my @known_clients_col_names = ("hostname VARCHAR(255)", "status VARCHAR(255)", "hostkey VARCHAR(255)", "timestamp VARCHAR(14)", "macaddress VARCHAR(17)", "events TEXT", "keylifetime VARCHAR(255)");
 
 # holds all registered clients at a foreign server
 our $foreign_clients_db;
 our $foreign_clients_tn = "foreign_clients"; 
 my $foreign_clients_file_name;
-my @foreign_clients_col_names = ("hostname", "macaddress", "regserver", "timestamp");
+my @foreign_clients_col_names = ("hostname VARCHAR(255)", "macaddress VARCHAR(17)", "regserver VARCHAR(255)", "timestamp VARCHAR(14)");
 
 # holds all logged in user at each client 
 our $login_users_db;
 our $login_users_tn = "login_users";
 my $login_users_file_name;
-my @login_users_col_names = ("client", "user", "timestamp");
+my @login_users_col_names = ("client VARCHAR(255)", "user VARCHAR(255)", "timestamp VARCHAR(14)", "regserver VARCHAR(255) DEFAULT 'localhost'");
 
 # holds all fai server, the debian release and tag
 our $fai_server_db;
 our $fai_server_tn = "fai_server"; 
 my $fai_server_file_name;
-our @fai_server_col_names = ("timestamp", "server", "release", "sections", "tag"); 
+our @fai_server_col_names = ("timestamp VARCHAR(14)", "server VARCHAR(255)", "fai_release VARCHAR(255)", "sections VARCHAR(255)", "tag VARCHAR(255)"); 
 
 our $fai_release_db;
 our $fai_release_tn = "fai_release"; 
 my $fai_release_file_name;
-our @fai_release_col_names = ("timestamp", "release", "class", "type", "state"); 
+our @fai_release_col_names = ("timestamp VARCHAR(14)", "fai_release VARCHAR(255)", "class VARCHAR(255)", "type VARCHAR(255)", "state VARCHAR(255)"); 
 
 # holds all packages available from different repositories
 our $packages_list_db;
 our $packages_list_tn = "packages_list";
 my $packages_list_file_name;
-our @packages_list_col_names = ("distribution", "package", "version", "section", "description", "template", "timestamp");
+our @packages_list_col_names = ("distribution VARCHAR(255)", "package VARCHAR(255)", "version VARCHAR(255)", "section VARCHAR(255)", "description TEXT", "template LONGBLOB", "timestamp VARCHAR(14)");
 my $outdir = "/tmp/packages_list_db";
 my $arch = "i386"; 
 
 # holds all messages which should be delivered to a user
 our $messaging_db;
 our $messaging_tn = "messaging"; 
-our @messaging_col_names = ("id INTEGER", "subject", "message_from", "message_to", 
-        "flag", "direction", "delivery_time", "message", "timestamp" );
+our @messaging_col_names = ("id INTEGER", "subject TEXT", "message_from VARCHAR(255)", "message_to VARCHAR(255)", 
+        "flag VARCHAR(255)", "direction VARCHAR(255)", "delivery_time VARCHAR(255)", "message TEXT", "timestamp VARCHAR(14)" );
 my $messaging_file_name;
 
 # path to directory to store client install log files
 our $client_fai_log_dir = "/var/log/fai"; 
 
 # queue which stores taskes until one of the $max_children children are ready to process the task
-my @tasks = qw();
+#my @tasks = qw();
 my @msgs_to_decrypt = qw();
 my $max_children = 2;
 
@@ -246,6 +254,10 @@ our $logged_in_user_date_of_expiry = 600;
     "gosa-unit-tag"         => [\$gosa_unit_tag, ""],
     "max-clients"           => [\$max_clients, 10],
     "wol-password"          => [\$wake_on_lan_passwd, ""],
+               "mysql-username"        => [\$mysql_username, "gosa_si"],
+               "mysql-password"        => [\$mysql_password, ""],
+               "mysql-database"        => [\$mysql_database, "gosa_si"],
+               "mysql-host"            => [\$mysql_host, "127.0.0.1"],
     },
 "GOsaPackages" => {
     "job-queue" => [\$job_queue_file_name, '/var/lib/gosa-si/jobs.db'],
@@ -450,7 +462,8 @@ sub import_modules {
         eval { require $file; };
         if ($@) {
             daemon_log("0 ERROR: gosa-si-server could not load module $file", 1);
-            daemon_log("$@", 5);
+            daemon_log("$@", 1);
+           exit;
                } else {
                        my $info = eval($mod_name.'::get_module_info()');
                        # Only load module if get_module_info() returns a non-null object
@@ -522,14 +535,14 @@ sub check_key_and_xml_validity {
 
         if ($msg =~ /<xml>/i){
             $msg =~ s/\s+/ /g;  # just for better daemon_log
-            daemon_log("$session_id DEBUG: decrypted_msg: \n$msg", 8);
+            daemon_log("$session_id DEBUG: decrypted_msg: \n$msg", 9);
             $msg_hash = $xml->XMLin($msg, ForceArray=>1);
 
             ##############
             # check header
             if( not exists $msg_hash->{'header'} ) { die "no header specified"; }
             my $header_l = $msg_hash->{'header'};
-            if( 1 > @{$header_l} ) { die 'empty header tag'; }
+            if( (1 > @{$header_l}) || ( ( 'HASH' eq ref @{$header_l}[0]) && (1 > keys %{@{$header_l}[0]}) ) ) { die 'empty header tag'; }
             if( 1 < @{$header_l} ) { die 'more than one header specified'; }
             my $header = @{$header_l}[0];
             if( 0 == length $header) { die 'empty string in header tag'; }
@@ -538,7 +551,7 @@ sub check_key_and_xml_validity {
             # check source
             if( not exists $msg_hash->{'source'} ) { die "no source specified"; }
             my $source_l = $msg_hash->{'source'};
-            if( 1 > @{$source_l} ) { die 'empty source tag'; }
+            if( (1 > @{$source_l}) || ( ( 'HASH' eq ref @{$source_l}[0]) && (1 > keys %{@{$source_l}[0]}) ) ) { die 'empty source tag'; }
             if( 1 < @{$source_l} ) { die 'more than one source specified'; }
             my $source = @{$source_l}[0];
             if( 0 == length $source) { die 'source error'; }
@@ -547,7 +560,7 @@ sub check_key_and_xml_validity {
             # check target
             if( not exists $msg_hash->{'target'} ) { die "no target specified"; }
             my $target_l = $msg_hash->{'target'};
-            if( 1 > @{$target_l} ) { die 'empty target tag'; }
+            if( (1 > @{$target_l}) || ( ('HASH' eq ref @{$target_l}[0]) && (1 > keys %{@{$target_l}[0]}) ) ) { die 'empty target tag'; }
         }
     };
     if($@) {
@@ -588,8 +601,18 @@ sub check_outgoing_xml_validity {
         if( 0 == length $source) {
             die 'source has length 0';
         }
+
+                               # Check if source contains hostname instead of ip address
+                               if(not $source =~ /^[a-z0-9\.]+:\d+$/i) {
+                                               my ($hostname,$port) = split(/:/, $source);
+                                               my $ip_address = inet_ntoa(scalar gethostbyname($hostname));
+                                               if(defined($ip_address) && $ip_address =~ /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/ && $port =~ /^\d+$/) {
+                                                       # Write ip address to $source variable
+                                                       $source = "$ip_address:$port";
+                                               }
+                               }
         unless( $source =~ /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}:\d+$/ ||
-                $source =~ /^GOSA$/i ) {
+                $source =~ /^GOSA$/i) {
             die "source '$source' is neither a complete ip-address with port nor 'GOSA'";
         }
         
@@ -650,6 +673,7 @@ sub input_from_known_server {
             $msg = $tmp_msg;
             $msg_hash = $tmp_msg_hash;
             $module = "ServerPackages";
+            daemon_log("$session_id DEBUG: check_key_and_xml_validity... ok", 7);
             last;
         }
     }
@@ -687,6 +711,7 @@ sub input_from_known_client {
         }
         else {
             $module = "ClientPackages";
+            daemon_log("$session_id DEBUG: check_key_and_xml_validity... ok", 7);
             last;
         }
     }
@@ -726,6 +751,7 @@ sub input_from_unknown_host {
                        next;
                } else {
                        $module = $mod;
+            daemon_log("$session_id DEBUG: check_key_and_xml_validity... ok", 7);
                        last;
                }
        }
@@ -978,29 +1004,88 @@ sub send_msg_to_target {
 
 
 sub update_jobdb_status_for_send_msgs {
-    my ($answer, $error) = @_;
+    my ($session_id, $answer, $error) = @_;
+    &daemon_log("$session_id DEBUG: try to update job status", 7); 
     if( $answer =~ /<jobdb_id>(\d+)<\/jobdb_id>/ ) {
         my $jobdb_id = $1;
+    
+        $answer =~ /<header>(.*)<\/header>/;
+        my $job_header = $1;
+
+        $answer =~ /<target>(.*)<\/target>/;
+        my $job_target = $1;
             
-        # sending msg faild
+        # Sending msg failed
         if( $error ) {
-            if (not $answer =~ /<header>trigger_action_reinstall<\/header>/) {
+
+            # Set jobs to done, jobs do not need to deliver their message in any case
+            if (($job_header eq "trigger_action_localboot")
+                    ||($job_header eq "trigger_action_lock")
+                    ||($job_header eq "trigger_action_halt") 
+                    ) {
+                my $sql_statement = "UPDATE $job_queue_tn SET status='done' WHERE id=$jobdb_id";
+                &daemon_log("$session_id DEBUG: $sql_statement", 7); 
+                my $res = $job_db->update_dbentry($sql_statement);
+                
+            # Reactivate jobs, jobs need to deliver their message
+            } elsif (($job_header eq "trigger_action_activate")
+                    ||($job_header eq "trigger_action_update")
+                    ||($job_header eq "trigger_action_reinstall") 
+                    ||($job_header eq "trigger_activate_new")
+                    ) {
+                &reactivate_job_with_delay($session_id, $job_target, $job_header, 30 );
+
+            # For all other messages
+            } else {
                 my $sql_statement = "UPDATE $job_queue_tn ".
                     "SET status='error', result='can not deliver msg, please consult log file' ".
                     "WHERE id=$jobdb_id";
+                &daemon_log("$session_id DEBUG: $sql_statement", 7); 
                 my $res = $job_db->update_dbentry($sql_statement);
             }
 
-        # sending msg was successful
+        # Sending msg was successful
         } else {
-            my $sql_statement = "UPDATE $job_queue_tn ".
-                "SET status='done' ".
-                "WHERE id=$jobdb_id AND status='processed'";
-            my $res = $job_db->update_dbentry($sql_statement);
-        }
+            # Set jobs localboot, lock, activate, halt, reboot and wake to done
+            # jobs reinstall, update, inst_update do themself setting to done
+            if (($job_header eq "trigger_action_localboot")
+                    ||($job_header eq "trigger_action_lock")
+                    ||($job_header eq "trigger_action_activate")
+                    ||($job_header eq "trigger_action_halt") 
+                    ||($job_header eq "trigger_action_reboot")
+                    ||($job_header eq "trigger_action_wake")
+                    ||($job_header eq "trigger_wake")
+                    ) {
+
+                my $sql_statement = "UPDATE $job_queue_tn ".
+                    "SET status='done' ".
+                    "WHERE id=$jobdb_id AND status='processed'";
+                &daemon_log("$session_id DEBUG: $sql_statement", 7); 
+                my $res = $job_db->update_dbentry($sql_statement);
+            } else { 
+                &daemon_log("$session_id DEBUG: sending message succeed but cannot update job status.", 7); 
+            } 
+        } 
+    } else { 
+        &daemon_log("$session_id DEBUG: cannot update job status, msg has no jobdb_id-tag: $answer", 7); 
     }
 }
 
+sub reactivate_job_with_delay {
+    my ($session_id, $target, $header, $delay) = @_ ;
+    # Sometimes the client is still booting or does not wake up, in this case reactivate the job (if it exists) with a delay of n sec
+    
+    if (not defined $delay) { $delay = 30 } ;
+    my $delay_timestamp = &calc_timestamp(&get_time(), "plus", $delay);
+
+    my $sql = "UPDATE $job_queue_tn Set timestamp='$delay_timestamp', status='waiting' WHERE (macaddress='$target' AND headertag='$header')"; 
+    my $res = $job_db->update_dbentry($sql);
+    daemon_log("$session_id INFO: '$header'-job will be reactivated at '$delay_timestamp' ".
+            "cause client '$target' is currently not available", 5);
+    daemon_log("$session_id $sql", 7);                             
+    return;
+}
+
 
 sub sig_handler {
        my ($kernel, $signal) = @_[KERNEL, ARG0] ;
@@ -1011,263 +1096,263 @@ sub sig_handler {
 
 
 sub msg_to_decrypt {
-    my ($kernel, $session, $heap) = @_[KERNEL, SESSION, HEAP];
-    my $session_id = $session->ID;
-    my ($msg, $msg_hash, $module);
-    my $error = 0;
+       my ($kernel, $session, $heap) = @_[KERNEL, SESSION, HEAP];
+       my $session_id = $session->ID;
+       my ($msg, $msg_hash, $module);
+       my $error = 0;
 
-    # hole neue msg aus @msgs_to_decrypt
-    my $next_msg = shift @msgs_to_decrypt;
-    
-    # entschlüssle sie
+       # 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);
-    # msg is from a gosa-si-server
-    if(( !$msg ) || ( !$msg_hash ) || ( !$module )){
-        ($msg, $msg_hash, $module) = &input_from_known_server($next_msg, $heap->{'remote_ip'}, $session_id);
-    }
-    # msg is from a gosa-si-client
-    if(( !$msg ) || ( !$msg_hash ) || ( !$module )){
-        ($msg, $msg_hash, $module) = &input_from_known_client($next_msg, $heap->{'remote_ip'}, $session_id);
-    }
-    # an error occurred
-    if(( !$msg ) || ( !$msg_hash ) || ( !$module )){
-        # if an incoming msg could not be decrypted (maybe a wrong key), send client a ping. If the client
-        # could not understand a msg from its server the client cause a re-registering process
-        daemon_log("$session_id WARNING cannot understand incoming msg, send 'ping'-msg to all host with ip '".$heap->{remote_ip}.
-                "' to cause a re-registering of the client if necessary", 3);
-        my $sql_statement = "SELECT * FROM $main::known_clients_tn WHERE (hostname LIKE '".$heap->{'remote_ip'}."%')";
-        my $query_res = $known_clients_db->select_dbentry( $sql_statement ); 
-        while( my ($hit_num, $hit) = each %{ $query_res } ) {    
-            my $host_name = $hit->{'hostname'};
-            my $host_key = $hit->{'hostkey'};
-            my $ping_msg = "<xml> <header>gosa_ping</header> <source>$server_address</source> <target>$host_name</target></xml>";
-            my $error = &send_msg_to_target($ping_msg, $host_name, $host_key, "gosa_ping", $session_id);
-            &update_jobdb_status_for_send_msgs($ping_msg, $error);
-        }
-        $error++;
-    }
+       # msg is from a new client or gosa
+       ($msg, $msg_hash, $module) = &input_from_unknown_host($next_msg, $session_id);
 
+       # msg is from a gosa-si-server
+       if(( !$msg ) || ( !$msg_hash ) || ( !$module )){
+               ($msg, $msg_hash, $module) = &input_from_known_server($next_msg, $heap->{'remote_ip'}, $session_id);
+       }
+       # msg is from a gosa-si-client
+       if(( !$msg ) || ( !$msg_hash ) || ( !$module )){
+               ($msg, $msg_hash, $module) = &input_from_known_client($next_msg, $heap->{'remote_ip'}, $session_id);
+       }
+       # an error occurred
+       if(( !$msg ) || ( !$msg_hash ) || ( !$module )){
+               # if an incoming msg could not be decrypted (maybe a wrong key), send client a ping. If the client
+               # could not understand a msg from its server the client cause a re-registering process
+        my $remote_ip = $heap->{'remote_ip'};
+        my $remote_port = $heap->{'remote_port'};
+        my $ping_msg = "<xml> <header>gosa_ping</header> <source>$server_address</source><target>$msg_source</target></xml>";
+        my ($test_error, $test_error_string) = &send_msg_to_target($ping_msg, "$msg_source", "dummy-key", "gosa_ping", $session_id);
+
+               daemon_log("$session_id WARNING cannot understand incoming msg, send 'ping'-msg to all host with ip '".$heap->{remote_ip}.
+                       "' to cause a re-registering of the client if necessary", 3);
+               $error++;
+       }
 
-    my $header;
-    my $target;
-    my $source;
-    my $done = 0;
-    my $sql;
-    my $res;
-
-    # check whether this message should be processed here
-    if ($error == 0) {
-        $header = @{$msg_hash->{'header'}}[0];
-        $target = @{$msg_hash->{'target'}}[0];
-        $source = @{$msg_hash->{'source'}}[0];
+
+       my $header;
+       my $target;
+       my $source;
+       my $done = 0;
+       my $sql;
+       my $res;
+
+       # check whether this message should be processed here
+       if ($error == 0) {
+               $header = @{$msg_hash->{'header'}}[0];
+               $target = @{$msg_hash->{'target'}}[0];
+               $source = @{$msg_hash->{'source'}}[0];
                my $not_found_in_known_clients_db = 0;
                my $not_found_in_known_server_db = 0;
                my $not_found_in_foreign_clients_db = 0;
-        my $local_address;
-        my $local_mac;
-        my ($target_ip, $target_port) = split(':', $target);
-        
-        # Determine the local ip address if target is an ip address
+               my $local_address;
+               my $local_mac;
+               my ($target_ip, $target_port) = split(':', $target);
+
+               # Determine the local ip address if target is an ip address
                if ($target =~ /^\d+\.\d+\.\d+\.\d+:\d+$/) {
                        $local_address = &get_local_ip_for_remote_ip($target_ip).":$server_port";
                } else {
-            $local_address = $server_address;
-        }
+                       $local_address = $server_address;
+               }
 
-        # Determine the local mac address if target is a mac address
-        if ($target =~ /^([0-9a-f]{2}:[0-9a-f]{2}:[0-9a-f]{2}:[0-9a-f]{2}:[0-9a-f]{2}:[0-9a-f]{2})$/i) {
-            my $loc_ip = &get_local_ip_for_remote_ip($heap->{'remote_ip'});
-            my $network_interface= &get_interface_for_ip($loc_ip);
-            $local_mac = &get_mac_for_interface($network_interface);
-        } else {
-            $local_mac = $server_mac_address;
-        }
+               # Determine the local mac address if target is a mac address
+               if ($target =~ /^([0-9a-f]{2}:[0-9a-f]{2}:[0-9a-f]{2}:[0-9a-f]{2}:[0-9a-f]{2}:[0-9a-f]{2})$/i) {
+                       my $loc_ip = &get_local_ip_for_remote_ip($heap->{'remote_ip'});
+                       my $network_interface= &get_interface_for_ip($loc_ip);
+                       $local_mac = &get_mac_for_interface($network_interface);
+               } else {
+                       $local_mac = $server_mac_address;
+               }
 
-        # target and source is equal to GOSA -> process here
-        if (not $done) {
-            if ($target eq "GOSA" && $source eq "GOSA") {
-                $done = 1;                    
-                &daemon_log("$session_id DEBUG: target and source is 'GOSA' -> process here", 7);
-            }
-        }
+               # target and source is equal to GOSA -> process here
+               if (not $done) {
+                       if ($target eq "GOSA" && $source eq "GOSA") {
+                               $done = 1;                    
+                               &daemon_log("$session_id DEBUG: target and source is 'GOSA' -> process here", 7);
+                       }
+               }
 
-        # target is own address without forward_to_gosa-tag -> process here
-        if (not $done) {
-            #if ((($target eq $local_address) || ($target eq $local_mac) ) && (not exists $msg_hash->{'forward_to_gosa'})) {
-            if (($target eq $local_address) && (not exists $msg_hash->{'forward_to_gosa'})) {
-                $done = 1;
-                if ($source eq "GOSA") {
-                    $msg =~ s/<\/xml>/<forward_to_gosa>$local_address,$session_id<\/forward_to_gosa><\/xml>/;
-                }
-                &daemon_log("$session_id DEBUG: target is own address without forward_to_gosa-tag -> process here", 7);
-            }
-        }
+               # target is own address without forward_to_gosa-tag -> process here
+               if (not $done) {
+                       #if ((($target eq $local_address) || ($target eq $local_mac) ) && (not exists $msg_hash->{'forward_to_gosa'})) {
+                       if (($target eq $local_address) && (not exists $msg_hash->{'forward_to_gosa'})) {
+                               $done = 1;
+                               if ($source eq "GOSA") {
+                                       $msg =~ s/<\/xml>/<forward_to_gosa>$local_address,$session_id<\/forward_to_gosa><\/xml>/;
+                               }
+                               &daemon_log("$session_id DEBUG: target is own address without forward_to_gosa-tag -> process here", 7);
+                       }
+               }
 
-        # target is a client address in known_clients -> process here
+               # target is a client address in known_clients -> process here
                if (not $done) {
-                               $sql = "SELECT * FROM $known_clients_tn WHERE (hostname='$target' OR macaddress LIKE '$target')"; 
-                               $res = $known_clients_db->select_dbentry($sql);
-                               if (keys(%$res) > 0) {
-                                               $done = 1; 
-                                               my $hostname = $res->{1}->{'hostname'};
-                                               $msg =~ s/<target>$target<\/target>/<target>$hostname<\/target>/;
-                        my $local_address = &get_local_ip_for_remote_ip($target_ip).":$server_port";
-                        if ($source eq "GOSA") {
-                            $msg =~ s/<\/xml>/<forward_to_gosa>$local_address,$session_id<\/forward_to_gosa><\/xml>/;
-                        }
-                        &daemon_log("$session_id DEBUG: target is a client address in known_clients -> process here", 7);
+                       $sql = "SELECT * FROM $known_clients_tn WHERE (hostname='$target' OR macaddress LIKE '$target')"; 
+                       $res = $known_clients_db->select_dbentry($sql);
+                       if (keys(%$res) > 0) {
+                               $done = 1; 
+                               my $hostname = $res->{1}->{'hostname'};
+                               $msg =~ s/<target>$target<\/target>/<target>$hostname<\/target>/;
+                               my $local_address = &get_local_ip_for_remote_ip($target_ip).":$server_port";
+                               if ($source eq "GOSA") {
+                                       $msg =~ s/<\/xml>/<forward_to_gosa>$local_address,$session_id<\/forward_to_gosa><\/xml>/;
+                               }
+                               &daemon_log("$session_id DEBUG: target is a client address in known_clients -> process here", 7);
 
-                               } else {
-                                               $not_found_in_known_clients_db = 1;
+                       } else {
+                               $not_found_in_known_clients_db = 1;
+                       }
+               }
+
+               # target ist own address with forward_to_gosa-tag not pointing to myself -> process here
+               if (not $done) {
+                       my $forward_to_gosa =  @{$msg_hash->{'forward_to_gosa'}}[0];
+                       my $gosa_at;
+                       my $gosa_session_id;
+                       if (($target eq $local_address) && (defined $forward_to_gosa)){
+                               my ($gosa_at, $gosa_session_id) = split(/,/, $forward_to_gosa);
+                               if ($gosa_at ne $local_address) {
+                                       $done = 1;
+                                       &daemon_log("$session_id DEBUG: target is own address with forward_to_gosa-tag not pointing to myself -> process here", 7); 
                                }
+                       }
                }
-       
-        # target ist own address with forward_to_gosa-tag not pointing to myself -> process here
-        if (not $done) {
-            my $forward_to_gosa =  @{$msg_hash->{'forward_to_gosa'}}[0];
-            my $gosa_at;
-            my $gosa_session_id;
-            if (($target eq $local_address) && (defined $forward_to_gosa)){
-                my ($gosa_at, $gosa_session_id) = split(/,/, $forward_to_gosa);
-                if ($gosa_at ne $local_address) {
-                    $done = 1;
-                    &daemon_log("$session_id DEBUG: target is own address with forward_to_gosa-tag not pointing to myself -> process here", 7); 
-                }
-            }
-        }
 
-        # if message should be processed here -> add message to incoming_db
+               # if message should be processed here -> add message to incoming_db
                if ($done) {
-                               # if a job or a gosa message comes from a foreign server, fake module to GosaPackages
-                               # so gosa-si-server knows how to process this kind of messages
-                               if ($header =~ /^gosa_/ || $header =~ /^job_/) {
-                                               $module = "GosaPackages";
-                               }
+                       # if a job or a gosa message comes from a foreign server, fake module to GosaPackages
+                       # so gosa-si-server knows how to process this kind of messages
+                       if ($header =~ /^gosa_/ || $header =~ /^job_/) {
+                               $module = "GosaPackages";
+                       }
+
+                       my $res = $incoming_db->add_dbentry( {table=>$incoming_tn,
+                                       primkey=>[],
+                                       headertag=>$header,
+                                       targettag=>$target,
+                                       xmlmessage=>&encode_base64($msg),
+                                       timestamp=>&get_time,
+                                       module=>$module,
+                                       sessionid=>$session_id,
+                               } );
 
-                               my $res = $incoming_db->add_dbentry( {table=>$incoming_tn,
-                                                               primkey=>[],
-                                                               headertag=>$header,
-                                                               targettag=>$target,
-                                                               xmlmessage=>&encode_base64($msg),
-                                                               timestamp=>&get_time,
-                                                               module=>$module,
-                                                               sessionid=>$session_id,
-                                                               } );
                }
 
-        # target is own address with forward_to_gosa-tag pointing at myself -> forward to gosa
-        if (not $done) {
-            my $forward_to_gosa =  @{$msg_hash->{'forward_to_gosa'}}[0];
-            my $gosa_at;
-            my $gosa_session_id;
-            if (($target eq $local_address) && (defined $forward_to_gosa)){
-                my ($gosa_at, $gosa_session_id) = split(/,/, $forward_to_gosa);
-                if ($gosa_at eq $local_address) {
-                    my $session_reference = $kernel->ID_id_to_session($gosa_session_id);
-                    if( defined $session_reference ) {
-                        $heap = $session_reference->get_heap();
-                    }
-                    if(exists $heap->{'client'}) {
-                        $msg = &encrypt_msg($msg, $GosaPackages_key);
-                        $heap->{'client'}->put($msg);
-                        &daemon_log("$session_id INFO: incoming '$header' message forwarded to GOsa", 5); 
-                    }
-                    $done = 1;
-                    &daemon_log("$session_id DEBUG: target is own address with forward_to_gosa-tag pointing at myself -> forward to gosa", 7);
-                }
-            }
+               # target is own address with forward_to_gosa-tag pointing at myself -> forward to gosa
+               if (not $done) {
+                       my $forward_to_gosa =  @{$msg_hash->{'forward_to_gosa'}}[0];
+                       my $gosa_at;
+                       my $gosa_session_id;
+                       if (($target eq $local_address) && (defined $forward_to_gosa)){
+                               my ($gosa_at, $gosa_session_id) = split(/,/, $forward_to_gosa);
+                               if ($gosa_at eq $local_address) {
+                                       my $session_reference = $kernel->ID_id_to_session($gosa_session_id);
+                                       if( defined $session_reference ) {
+                                               $heap = $session_reference->get_heap();
+                                       }
+                                       if(exists $heap->{'client'}) {
+                                               $msg = &encrypt_msg($msg, $GosaPackages_key);
+                                               $heap->{'client'}->put($msg);
+                                               &daemon_log("$session_id INFO: incoming '$header' message forwarded to GOsa", 5); 
+                                       }
+                                       $done = 1;
+                                       &daemon_log("$session_id DEBUG: target is own address with forward_to_gosa-tag pointing at myself -> forward to gosa", 7);
+                               }
+                       }
 
-        }
+               }
 
-        # target is a client address in foreign_clients -> forward to registration server
-        if (not $done) {
-            $sql = "SELECT * FROM $foreign_clients_tn WHERE (hostname='$target' OR macaddress LIKE '$target')";
-            $res = $foreign_clients_db->select_dbentry($sql);
-            if (keys(%$res) > 0) {
-                   my $hostname = $res->{1}->{'hostname'};
-                   my ($host_ip, $host_port) = split(/:/, $hostname);
-                   my $local_address =  &get_local_ip_for_remote_ip($host_ip).":$server_port";
-                my $regserver = $res->{1}->{'regserver'};
-                my $sql = "SELECT * FROM $known_server_tn WHERE hostname='$regserver'"; 
-                my $res = $known_server_db->select_dbentry($sql);
-                if (keys(%$res) > 0) {
-                    my $regserver_key = $res->{1}->{'hostkey'};
-                    $msg =~ s/<source>GOSA<\/source>/<source>$local_address<\/source>/;
-                    $msg =~ s/<target>$target<\/target>/<target>$hostname<\/target>/;
-                    if ($source eq "GOSA") {
-                        $msg =~ s/<\/xml>/<forward_to_gosa>$local_address,$session_id<\/forward_to_gosa><\/xml>/;
-                    }
-                    &send_msg_to_target($msg, $regserver, $regserver_key, $header, $session_id);
-                }
-                $done = 1;
-                &daemon_log("$session_id DEBUG: target is a client address in foreign_clients -> forward to registration server", 7);
-            } else {
+               # target is a client address in foreign_clients -> forward to registration server
+               if (not $done) {
+                       $sql = "SELECT * FROM $foreign_clients_tn WHERE (hostname='$target' OR macaddress LIKE '$target')";
+                       $res = $foreign_clients_db->select_dbentry($sql);
+                       if (keys(%$res) > 0) {
+                               my $hostname = $res->{1}->{'hostname'};
+                               my ($host_ip, $host_port) = split(/:/, $hostname);
+                               my $local_address =  &get_local_ip_for_remote_ip($host_ip).":$server_port";
+                               my $regserver = $res->{1}->{'regserver'};
+                               my $sql = "SELECT * FROM $known_server_tn WHERE hostname='$regserver'"; 
+                               my $res = $known_server_db->select_dbentry($sql);
+                               if (keys(%$res) > 0) {
+                                       my $regserver_key = $res->{1}->{'hostkey'};
+                                       $msg =~ s/<source>GOSA<\/source>/<source>$local_address<\/source>/;
+                                       $msg =~ s/<target>$target<\/target>/<target>$hostname<\/target>/;
+                                       if ($source eq "GOSA") {
+                                               $msg =~ s/<\/xml>/<forward_to_gosa>$local_address,$session_id<\/forward_to_gosa><\/xml>/;
+                                       }
+                                       &send_msg_to_target($msg, $regserver, $regserver_key, $header, $session_id);
+                               }
+                               $done = 1;
+                               &daemon_log("$session_id DEBUG: target is a client address in foreign_clients -> forward to registration server", 7);
+                       } else {
                                $not_found_in_foreign_clients_db = 1;
                        }
-        }
+               }
 
-        # target is a server address -> forward to server
-        if (not $done) {
-            $sql = "SELECT * FROM $known_server_tn WHERE (hostname='$target' OR macaddress LIKE '$target')";
-            $res = $known_server_db->select_dbentry($sql);
-            if (keys(%$res) > 0) {
-                my $hostkey = $res->{1}->{'hostkey'};
+               # target is a server address -> forward to server
+               if (not $done) {
+                       $sql = "SELECT * FROM $known_server_tn WHERE (hostname='$target' OR macaddress LIKE '$target')";
+                       $res = $known_server_db->select_dbentry($sql);
+                       if (keys(%$res) > 0) {
+                               my $hostkey = $res->{1}->{'hostkey'};
 
-                if ($source eq "GOSA") {
-                    $msg =~ s/<source>GOSA<\/source>/<source>$local_address<\/source>/;
-                    $msg =~ s/<\/xml>/<forward_to_gosa>$local_address,$session_id<\/forward_to_gosa><\/xml>/;
+                               if ($source eq "GOSA") {
+                                       $msg =~ s/<source>GOSA<\/source>/<source>$local_address<\/source>/;
+                                       $msg =~ s/<\/xml>/<forward_to_gosa>$local_address,$session_id<\/forward_to_gosa><\/xml>/;
 
-                }
+                               }
 
-                &send_msg_to_target($msg, $target, $hostkey, $header, $session_id);
-                $done = 1;
-                &daemon_log("$session_id DEBUG: target is a server address -> forward to server", 7);
-            } else {
+                               &send_msg_to_target($msg, $target, $hostkey, $header, $session_id);
+                               $done = 1;
+                               &daemon_log("$session_id DEBUG: target is a server address -> forward to server", 7);
+                       } else {
                                $not_found_in_known_server_db = 1;
                        }
-        }
+               }
+
 
-               
                # target is not in foreign_clients_db, known_server_db or known_clients_db, maybe it is a complete new one -> process here
                if ( $not_found_in_foreign_clients_db 
-                                               && $not_found_in_known_server_db
-                                               && $not_found_in_known_clients_db) {
-                               my $res = $incoming_db->add_dbentry( {table=>$incoming_tn,
-                                                               primkey=>[],
-                                                               headertag=>$header,
-                                                               targettag=>$target,
-                                                               xmlmessage=>&encode_base64($msg),
-                                                               timestamp=>&get_time,
-                                                               module=>$module,
-                                                               sessionid=>$session_id,
-                                                               } );
-                               $done = 1;
-                &daemon_log("$session_id DEBUG: target is not in foreign_clients_db, known_server_db or known_clients_db, maybe it is a complete new one -> process here", 7);
+                       && $not_found_in_known_server_db
+                       && $not_found_in_known_clients_db) {
+                       &daemon_log("$session_id DEBUG: target is not in foreign_clients_db, known_server_db or known_clients_db, maybe it is a complete new one -> process here", 7);
+            if ($header =~ /^gosa_/ || $header =~ /^job_/) { 
+                $module = "GosaPackages"; 
+            }
+                       my $res = $incoming_db->add_dbentry( {table=>$incoming_tn,
+                                       primkey=>[],
+                                       headertag=>$header,
+                                       targettag=>$target,
+                                       xmlmessage=>&encode_base64($msg),
+                                       timestamp=>&get_time,
+                                       module=>$module,
+                                       sessionid=>$session_id,
+                               } );
+                       $done = 1;
                }
 
 
-        if (not $done) {
-            daemon_log("$session_id ERROR: do not know what to do with this message: $msg", 1);
-            if ($source eq "GOSA") {
-                my %data = ('error_msg' => &encode_base64($msg), 'error_string' => "Do not know what to do with this message!");
-                my $error_msg = &build_msg("error", $local_address, "GOSA", \%data ); 
-
-                my $session_reference = $kernel->ID_id_to_session($session_id);
-                if( defined $session_reference ) {
-                    $heap = $session_reference->get_heap();
-                }
-                if(exists $heap->{'client'}) {
-                    $error_msg = &encrypt_msg($error_msg, $GosaPackages_key);
-                    $heap->{'client'}->put($error_msg);
-                }
-            }
-        }
+               if (not $done) {
+                       daemon_log("$session_id ERROR: do not know what to do with this message: $msg", 1);
+                       if ($source eq "GOSA") {
+                               my %data = ('error_msg' => &encode_base64($msg), 'error_string' => "Do not know what to do with this message!");
+                               my $error_msg = &build_msg("error", $local_address, "GOSA", \%data ); 
+
+                               my $session_reference = $kernel->ID_id_to_session($session_id);
+                               if( defined $session_reference ) {
+                                       $heap = $session_reference->get_heap();
+                               }
+                               if(exists $heap->{'client'}) {
+                                       $error_msg = &encrypt_msg($error_msg, $GosaPackages_key);
+                                       $heap->{'client'}->put($error_msg);
+                               }
+                       }
+               }
 
-    }
+       }
 
-    return;
+       return;
 }
 
 
@@ -1328,7 +1413,11 @@ sub process_task {
     my $module = $task->{'module'};
     my $header =  $task->{'headertag'};
     my $session_id = $task->{'sessionid'};
-    my $msg_hash = $xml->XMLin($msg, ForceArray=>1);
+               my $msg_hash;
+               eval {
+       $msg_hash = $xml->XMLin($msg, ForceArray=>1);
+               }; 
+               daemon_log("ERROR: XML failure '$@'") if ($@);
     my $source = @{$msg_hash->{'source'}}[0];
     
     # set timestamp of incoming client uptodate, so client will not 
@@ -1382,7 +1471,7 @@ sub process_task {
                         my $host_name = $hit->{hostname};
                         my $host_key = $hit->{hostkey};
                         my $error = &send_msg_to_target($answer, $host_name, $host_key, $answer_header, $session_id);
-                        &update_jobdb_status_for_send_msgs($answer, $error);
+                        &update_jobdb_status_for_send_msgs($session_id, $answer, $error);
                     }
                 }
 
@@ -1396,7 +1485,7 @@ sub process_task {
                         my $host_key = $hit->{hostkey};
                         $answer =~ s/<target>\S+<\/target>/<target>$host_name<\/target>/g;
                         my $error = &send_msg_to_target($answer, $host_name, $host_key, $answer_header, $session_id);
-                        &update_jobdb_status_for_send_msgs($answer, $error);
+                        &update_jobdb_status_for_send_msgs($session_id, $answer, $error);
                     }
                 }
 
@@ -1418,12 +1507,14 @@ sub process_task {
                     my $header;
                     if( defined $1 ) { $header = $1; }
                     my $error = &send_msg_to_target($answer, $server_address, $GosaPackages_key, $header, $session_id);
-                    &update_jobdb_status_for_send_msgs($answer, $error);
+                    &update_jobdb_status_for_send_msgs($session_id, $answer, $error);
                 }
 
                 # Target of msg is a mac address
                 elsif( $answer_target =~ /^([0-9a-f]{2}:[0-9a-f]{2}:[0-9a-f]{2}:[0-9a-f]{2}:[0-9a-f]{2}:[0-9a-f]{2})$/i ) {
                     daemon_log("$session_id INFO: target is mac address '$answer_target', looking for host in known_clients and foreign_clients", 5);
+
+                    # Looking for macaddress in known_clients
                     my $sql_statement = "SELECT * FROM known_clients WHERE macaddress LIKE '$answer_target'";
                     my $query_res = $known_clients_db->select_dbentry( $sql_statement );
                     my $found_ip_flag = 0;
@@ -1433,9 +1524,11 @@ sub process_task {
                         $answer =~ s/$answer_target/$host_name/g;
                         daemon_log("$session_id INFO: found host '$host_name', associated to '$answer_target'", 5);
                         my $error = &send_msg_to_target($answer, $host_name, $host_key, $answer_header, $session_id);
-                        &update_jobdb_status_for_send_msgs($answer, $error);
+                        &update_jobdb_status_for_send_msgs($session_id, $answer, $error);
                         $found_ip_flag++ ;
                     }   
+
+                    # Looking for macaddress in foreign_clients
                     if ($found_ip_flag == 0) {
                         my $sql = "SELECT * FROM $foreign_clients_tn WHERE macaddress LIKE '$answer_target'";
                         my $res = $foreign_clients_db->select_dbentry($sql);
@@ -1460,13 +1553,16 @@ sub process_task {
                             if (defined $reg_server_key) {
                                 $answer =~ s/$answer_target/$host_name/g;
                                 my $error = &send_msg_to_target($answer, $reg_server, $reg_server_key, $answer_header, $session_id);
-                                &update_jobdb_status_for_send_msgs($answer, $error);
+                                &update_jobdb_status_for_send_msgs($session_id, $answer, $error);
                                 $found_ip_flag++ ;
                             }
                         }
                     }
+
+                    # No mac to ip matching found
                     if( $found_ip_flag == 0) {
-                        daemon_log("$session_id WARNING: no host found in known_clients with mac address '$answer_target'", 3);
+                        daemon_log("$session_id WARNING: no host found in known_clients or foreign_clients with mac address '$answer_target'", 3);
+                        &reactivate_job_with_delay($session_id, $answer_target, $answer_header, 30);
                     }
 
                 # Answer is for one specific host   
@@ -1479,7 +1575,7 @@ sub process_task {
                         next;
                     }
                     my $error = &send_msg_to_target($answer, $answer_target, $encrypt_key, $answer_header,$session_id);
-                    &update_jobdb_status_for_send_msgs($answer, $error);
+                    &update_jobdb_status_for_send_msgs($session_id, $answer, $error);
                 }
             }
         }
@@ -1646,7 +1742,7 @@ sub watch_for_opsi_jobs {
 sub watch_for_modified_jobs {
     my ($kernel,$heap) = @_[KERNEL, HEAP];
 
-    my $sql_statement = "SELECT * FROM $job_queue_tn WHERE ((siserver='localhost') AND (modified='1'))"; 
+    my $sql_statement = "SELECT * FROM $job_queue_tn WHERE (modified='1')"; 
     my $res = $job_db->select_dbentry( $sql_statement );
     
     # if db contains no jobs which should be update, do nothing
@@ -1676,7 +1772,7 @@ sub watch_for_new_jobs {
 
                # check gosa job quaeue for jobs with executable timestamp
                my $timestamp = &get_time();
-               my $sql_statement = "SELECT * FROM $job_queue_tn WHERE status='waiting' AND (CAST (timestamp AS INTEGER)) < $timestamp ORDER BY timestamp";
+               my $sql_statement = "SELECT * FROM $job_queue_tn WHERE status='waiting' AND (CAST(timestamp AS UNSIGNED)) < $timestamp ORDER BY timestamp";
                my $res = $job_db->exec_statement( $sql_statement );
 
                # Merge all new jobs that would do the same actions
@@ -1731,7 +1827,7 @@ sub watch_for_new_jobs {
                                        if(defined($res_2) and defined @{$res_2}[0]) {
                                                # Set status from goto-activation to 'waiting' and update timestamp
                                                $job_db->exec_statement("UPDATE $job_queue_tn SET status='waiting' WHERE macaddress LIKE '$macaddress' AND headertag = 'trigger_action_reinstall'");
-                                               $job_db->exec_statement("UPDATE $job_queue_tn SET timestamp='".&get_time(30)."' WHERE macaddress LIKE '$macaddress' AND headertag = 'trigger_action_reinstall'");
+                                               $job_db->exec_statement("UPDATE $job_queue_tn SET timestamp='".&calc_timestamp(&get_time(), 'plus', 30)."' WHERE macaddress LIKE '$macaddress' AND headertag = 'trigger_action_reinstall'");
                                        }
                                }
                                next;
@@ -1757,12 +1853,23 @@ sub watch_for_new_jobs {
 
                                        $job_msg =~ /<header>(\S+)<\/header>/;
                                        my $header = $1 ;
-                                       my $func_error = &send_msg_to_target($job_msg, $server_address, $GosaPackages_key, $header, "J");
+                                       my $func_error = &send_msg_to_target($job_msg, $server_address, $GosaPackages_key, $header, "J");                    
+
+                                       # update status in job queue to ...
+                    # ... 'processing', for jobs: 'reinstall', 'update'
+                    if (($header =~ /gosa_trigger_action_reinstall/) 
+                            || ($header =~ /gosa_trigger_activate_new/)
+                            || ($header =~ /gosa_trigger_action_update/)) {
+                        my $sql_statement = "UPDATE $job_queue_tn SET status='processing' WHERE id=$jobdb_id";
+                        my $dbres = $job_db->update_dbentry($sql_statement);
+                    }
 
-                                       # update status in job queue to 'processing'
-                                       $sql_statement = "UPDATE $job_queue_tn SET status='processing' WHERE id=$jobdb_id";
-                                       my $res = $job_db->update_dbentry($sql_statement);
-# TODO: abfangen ob alles in ordnung ist oder nicht, wenn nicht error schmeißen                                       
+                    # ... 'done', for all other jobs, they are no longer needed in the jobqueue
+                    else {
+                        my $sql_statement = "UPDATE $job_queue_tn SET status='done' WHERE id=$jobdb_id";
+                        my $dbres = $job_db->update_dbentry($sql_statement);
+                    }
+                
 
                                        # We don't want parallel processing
                                        last;
@@ -1782,7 +1889,7 @@ sub watch_for_new_messages {
     
     # check messaging_db for new incoming messages with executable timestamp
     my $timestamp = &get_time();
-    my $sql_statement = "SELECT * FROM $messaging_tn WHERE ( (CAST(timestamp AS INTEGER))<$timestamp AND flag='n' AND direction='in' )";
+    my $sql_statement = "SELECT * FROM $messaging_tn WHERE ( (CAST(timestamp AS UNSIGNED))<$timestamp AND flag='n' AND direction='in' )";
     my $res = $messaging_db->exec_statement( $sql_statement );
        foreach my $hit (@{$res}) {
 
@@ -1810,7 +1917,7 @@ sub watch_for_new_messages {
                                                                foreach my $entry (@entries) {
                                                                                my @receivers= $entry->get_value("memberUid");
                                                                                foreach my $receiver (@receivers) { 
-                                                                                               $receiver_h{$1} = 0;
+                                                                                               $receiver_h{$receiver} = 0;
                                                                                }
                                                                }
                                                } 
@@ -1883,9 +1990,10 @@ sub watch_for_delivery_messages {
         #&daemon_log("0 DEBUG: $sql", 7);
         my $res = $login_users_db->exec_statement($sql);
 
-        # reciver is logged in nowhere
+        # receiver is logged in nowhere
         if (not ref(@$res[0]) eq "ARRAY") { next; }    
 
+        # receiver ist logged in at a client registered at local server
                my $send_succeed = 0;
                foreach my $hit (@$res) {
                                my $receiver_host = @$hit[0];
@@ -2033,7 +2141,7 @@ sub watch_for_next_tasks {
 
     my $sql = "SELECT * FROM $incoming_tn";
     my $res = $incoming_db->select_dbentry($sql);
-
+    
     while ( my ($hit_num, $hit) = each %$res) {
         my $headertag = $hit->{'headertag'};
         if ($headertag =~ /^answer_(\d+)/) {
@@ -2041,13 +2149,15 @@ sub watch_for_next_tasks {
             next;
         }
         my $message_id = $hit->{'id'};
+        my $session_id = $hit->{'sessionid'};
+        &daemon_log("$session_id DEBUG: start processing for message with incoming id: '$message_id'", 7);
         $kernel->yield('next_task', $hit);
 
         my $sql = "DELETE FROM $incoming_tn WHERE id=$message_id";
         my $res = $incoming_db->exec_statement($sql);
     }
 
-    $kernel->delay_set('watch_for_next_tasks', 0.1); 
+    $kernel->delay_set('watch_for_next_tasks', 1); 
 }
 
 
@@ -2062,7 +2172,11 @@ sub get_ldap_handle {
        if ($session_id == 0) {
                daemon_log("$session_id DEBUG: get_ldap_handle invoked without a session_id, create a new ldap_handle", 7); 
                $ldap_handle = Net::LDAP->new( $ldap_uri );
-               $ldap_handle->bind($ldap_admin_dn, password => $ldap_admin_password) or daemon_log("$session_id ERROR: Bind to LDAP $ldap_uri as $ldap_admin_dn failed!"); 
+               if (defined $ldap_handle) {
+                       $ldap_handle->bind($ldap_admin_dn, password => $ldap_admin_password) or daemon_log("$session_id ERROR: Bind to LDAP $ldap_uri as $ldap_admin_dn failed!"); 
+               } else {
+                       daemon_log("$session_id ERROR: creation of a new LDAP handle failed (ldap_uri '$ldap_uri')");
+               }
 
        } else {
                my $session_reference = $global_kernel->ID_id_to_session($session_id);
@@ -2149,16 +2263,12 @@ sub change_fai_state {
                                  my %tmp = map { $_ => 1 } $entry->get_value("objectClass");
                                  if (exists $tmp{'FAIobject'}){
                                          if ($state eq ''){
-                                                 $result= $ldap_handle->modify($entry->dn, changes => [
-                                                         delete => [ FAIstate => [] ] ]);
+                                                 $result= $ldap_handle->modify($entry->dn, changes => [ delete => [ FAIstate => [] ] ]);
                                          } else {
-                                                 $result= $ldap_handle->modify($entry->dn, changes => [
-                                                         replace => [ FAIstate => $state ] ]);
+                                                 $result= $ldap_handle->modify($entry->dn, changes => [ replace => [ FAIstate => $state ] ]);
                                          }
                                  } elsif ($state ne ''){
-                                         $result= $ldap_handle->modify($entry->dn, changes => [
-                                                 add     => [ objectClass => 'FAIobject' ],
-                                                 add     => [ FAIstate => $state ] ]);
+                                         $result= $ldap_handle->modify($entry->dn, changes => [ add => [ objectClass => 'FAIobject' ], add => [ FAIstate => $state ] ]);
                                  }
 
                                  # Errors?
@@ -2221,8 +2331,7 @@ sub change_goto_state {
 
             daemon_log("$session_id INFO: Setting gotoMode to '$state' for ".$entry->dn, 5);
             my $result;
-            $result= $ldap_handle->modify($entry->dn, changes => [
-                                                replace => [ gotoMode => $state ] ]);
+            $result= $ldap_handle->modify($entry->dn, changes => [replace => [ gotoMode => $state ] ]);
 
             # Errors?
             if ($result->code){
@@ -2265,11 +2374,11 @@ sub run_create_fai_server_db {
 
 
 sub create_fai_server_db {
-    my ($table_name, $kernel, $dont_create_packages_list, $session_id) = @_;
+       my ($table_name, $kernel, $dont_create_packages_list, $session_id) = @_;
        my $result;
 
        if (not defined $session_id) { $session_id = 0; }
-    my $ldap_handle = &get_ldap_handle();
+       my $ldap_handle = &get_ldap_handle();
        if(defined($ldap_handle)) {
                daemon_log("$session_id INFO: create_fai_server_db: start", 5);
                my $mesg= $ldap_handle->search(
@@ -2279,25 +2388,25 @@ sub create_fai_server_db {
                        filter => "(&(FAIrepository=*)(objectClass=FAIrepositoryServer))",
                );
                if($mesg->{'resultCode'} == 0 &&
-                  $mesg->count != 0) {
-                  foreach my $entry (@{$mesg->{entries}}) {
-                          if($entry->exists('FAIrepository')) {
-                                  # Add an entry for each Repository configured for server
-                                  foreach my $repo(@{$entry->get_value('FAIrepository', asref => 1)}) {
-                                                  my($tmp_url,$tmp_server,$tmp_release,$tmp_sections) = split(/\|/, $repo);
-                                                  my $tmp_tag= $entry->get_value('gosaUnitTag') || "";
-                                                  $result= $fai_server_db->add_dbentry( { 
-                                                                  table => $table_name,
-                                                                  primkey => ['server', 'release', 'tag'],
-                                                                  server => $tmp_url,
-                                                                  release => $tmp_release,
-                                                                  sections => $tmp_sections,
-                                                                  tag => (length($tmp_tag)>0)?$tmp_tag:"",
-                                                          } );
-                                          }
-                                  }
-                          }
-                  }
+                       $mesg->count != 0) {
+                       foreach my $entry (@{$mesg->{entries}}) {
+                               if($entry->exists('FAIrepository')) {
+                                       # Add an entry for each Repository configured for server
+                                       foreach my $repo(@{$entry->get_value('FAIrepository', asref => 1)}) {
+                                               my($tmp_url,$tmp_server,$tmp_release,$tmp_sections) = split(/\|/, $repo);
+                                               my $tmp_tag= $entry->get_value('gosaUnitTag') || "";
+                                               $result= $fai_server_db->add_dbentry( { 
+                                                               table => $table_name,
+                                                               primkey => ['server', 'fai_release', 'tag'],
+                                                               server => $tmp_url,
+                                                               fai_release => $tmp_release,
+                                                               sections => $tmp_sections,
+                                                               tag => (length($tmp_tag)>0)?$tmp_tag:"",
+                                                       } );
+                                       }
+                               }
+                       }
+               }
                daemon_log("$session_id INFO: create_fai_server_db: finished", 5);
 
                # TODO: Find a way to post the 'create_packages_list_db' event
@@ -2305,24 +2414,24 @@ sub create_fai_server_db {
                        &create_packages_list_db(undef, undef, $session_id);
                }
        }       
-    
-    $ldap_handle->disconnect;
-       return $result;
+
+       $ldap_handle->disconnect;
+       return $result;
 }
 
 
 sub run_create_fai_release_db {
-    my ($session, $heap, $table_name) = @_[SESSION, HEAP, ARG0];
+       my ($session, $heap, $table_name) = @_[SESSION, HEAP, ARG0];
        my $session_id = $session->ID;
-    my $task = POE::Wheel::Run->new(
-            Program => sub { &create_fai_release_db($table_name, $session_id) },
-            StdoutEvent  => "session_run_result",
-            StderrEvent  => "session_run_debug",
-            CloseEvent   => "session_run_done",
-            );
+       my $task = POE::Wheel::Run->new(
+               Program => sub { &create_fai_release_db($table_name, $session_id) },
+               StdoutEvent  => "session_run_result",
+               StderrEvent  => "session_run_debug",
+               CloseEvent   => "session_run_done",
+       );
 
-    $heap->{task}->{ $task->ID } = $task;
-    return;
+       $heap->{task}->{ $task->ID } = $task;
+       return;
 }
 
 
@@ -2330,10 +2439,10 @@ sub create_fai_release_db {
        my ($table_name, $session_id) = @_;
        my $result;
 
-    # used for logging
-    if (not defined $session_id) { $session_id = 0; }
+       # used for logging
+       if (not defined $session_id) { $session_id = 0; }
 
-    my $ldap_handle = &get_ldap_handle();
+       my $ldap_handle = &get_ldap_handle();
        if(defined($ldap_handle)) {
                daemon_log("$session_id INFO: create_fai_release_db: start",5);
                my $mesg= $ldap_handle->search(
@@ -2356,7 +2465,7 @@ sub create_fai_release_db {
                                                        if(defined($entry) && ref($entry) eq 'HASH') {
                                                                my $sql= 
                                                                "INSERT INTO $table_name "
-                                                               ."(timestamp, release, class, type, state) VALUES ("
+                                                               ."(timestamp, fai_release, class, type, state) VALUES ("
                                                                .$timestamp.","
                                                                ."'".$entry->{'release'}."',"
                                                                ."'".$entry->{'class'}."',"
@@ -2371,7 +2480,6 @@ sub create_fai_release_db {
 
                        daemon_log("$session_id DEBUG: Inserting ".scalar @sql_list." entries to DB",8);
                        if(@sql_list) {
-                               unshift @sql_list, "VACUUM";
                                unshift @sql_list, "DELETE FROM $table_name";
                                $fai_release_db->exec_statementlist(\@sql_list);
                        }
@@ -2379,7 +2487,7 @@ sub create_fai_release_db {
                }
                daemon_log("$session_id INFO: create_fai_release_db: finished",5);
        }
-    $ldap_handle->disconnect;
+       $ldap_handle->disconnect;
        return $result;
 }
 
@@ -2758,11 +2866,11 @@ sub create_packages_list_db {
 
        close (CONFIG);
 
-
-       find(\&cleanup_and_extract, keys( %repo_dirs ));
-       &main::strip_packages_list_statements();
-       unshift @packages_list_statements, "VACUUM";
-       $packages_list_db->exec_statementlist(\@packages_list_statements);
+       if(keys(%repo_dirs)) {
+               find(\&cleanup_and_extract, keys( %repo_dirs ));
+               &main::strip_packages_list_statements();
+               $packages_list_db->exec_statementlist(\@packages_list_statements);
+       }
        unlink($packages_list_under_construction);
        daemon_log("$session_id INFO: create_packages_list_db: finished", 5); 
        return;
@@ -2770,12 +2878,13 @@ sub create_packages_list_db {
 
 # This function should do some intensive task to minimize the db-traffic
 sub strip_packages_list_statements {
-    my @existing_entries= @{$packages_list_db->exec_statement("SELECT * FROM $main::packages_list_tn")};
+       my @existing_entries= @{$packages_list_db->exec_statement("SELECT * FROM $main::packages_list_tn")};
        my @new_statement_list=();
        my $hash;
        my $insert_hash;
        my $update_hash;
        my $delete_hash;
+       my $known_packages_hash;
        my $local_timestamp=get_time();
 
        foreach my $existing_entry (@existing_entries) {
@@ -2794,6 +2903,9 @@ sub strip_packages_list_statements {
                                        (! (@{$hash->{$distribution}->{$package}->{$version}}[4] eq $description))
                                ) {
                                        @{$update_hash->{$distribution}->{$package}->{$version}} = ($distribution,$package,$version,$section,$description,undef);
+                               } else {
+                                       # package is already present in database. cache this knowledge for later use
+                                       @{$known_packages_hash->{$distribution}->{$package}->{$version}} = ($distribution,$package,$version,$section,$description,$template);
                                }
                        } else {
                                # Insert a non-existing entry to db
@@ -2824,9 +2936,26 @@ sub strip_packages_list_statements {
                }
        }
 
-       # TODO: Check for orphaned entries
+       # Check for orphaned entries
+       foreach my $existing_entry (@existing_entries) {
+               my $distribution= @{$existing_entry}[0];
+               my $package= @{$existing_entry}[1];
+               my $version= @{$existing_entry}[2];
+               my $section= @{$existing_entry}[3];
+
+               if(
+                       exists($insert_hash->{$distribution}->{$package}->{$version}) ||
+                       exists($update_hash->{$distribution}->{$package}->{$version}) ||
+                       exists($known_packages_hash->{$distribution}->{$package}->{$version})
+               ) {
+                       next;
+               } else {
+                       # Insert entry to delete hash
+                       @{$delete_hash->{$distribution}->{$package}->{$version}} = ($distribution,$package,$version,$section);
+               }
+       }
 
-       # unroll the insert_hash
+       # unroll the insert hash
        foreach my $distribution (keys %{$insert_hash}) {
                foreach my $package (keys %{$insert_hash->{$distribution}}) {
                        foreach my $version (keys %{$insert_hash->{$distribution}->{$package}}) {
@@ -2859,10 +2988,20 @@ sub strip_packages_list_statements {
                                        next;
                                }
                                push @new_statement_list, 
-                                       "UPDATE $main::packages_list_tn SET $set WHERE"
-                                       ." distribution = '$distribution'"
-                                       ." AND package = '$package'"
-                                       ." AND version = '$version'";
+                               "UPDATE $main::packages_list_tn SET $set WHERE"
+                               ." distribution = '$distribution'"
+                               ." AND package = '$package'"
+                               ." AND version = '$version'";
+                       }
+               }
+       }
+       
+       # unroll the delete hash
+       foreach my $distribution (keys %{$delete_hash}) {
+               foreach my $package (keys %{$delete_hash->{$distribution}}) {
+                       foreach my $version (keys %{$delete_hash->{$distribution}->{$package}}) {
+                               my $section = @{$delete_hash->{$distribution}->{$package}->{$version}}[3];
+                               push @new_statement_list, "DELETE FROM $main::packages_list_tn WHERE distribution='$distribution' AND package='$package' AND version='$version' AND section='$section'";
                        }
                }
        }
@@ -2993,24 +3132,22 @@ sub store_fileinfo {
 
 
 sub cleanup_and_extract {
-    my $fileinfo = $repo_files{ $File::Find::name };
-
-    if( defined $fileinfo ) {
+       my $fileinfo = $repo_files{ $File::Find::name };
 
-        my $dir = "$outdir/$fileinfo->{ 'dist' }/debconf.d";
-        my $sql;
-        my $package = $fileinfo->{ 'package' };
-        my $newver = $fileinfo->{ 'version' };
+       if( defined $fileinfo ) {
+               my $dir = "$outdir/$fileinfo->{ 'dist' }/debconf.d";
+               my $sql;
+               my $package = $fileinfo->{ 'package' };
+               my $newver = $fileinfo->{ 'version' };
 
-        mkpath($dir);
-        system( "dpkg -e '$File::Find::name' '$dir/DEBIAN'" );
+               mkpath($dir);
+               system( "dpkg -e '$File::Find::name' '$dir/DEBIAN'" );
 
                if( -f "$dir/DEBIAN/templates" ) {
 
-                       daemon_log("DEBUG: Found debconf templates in '$package' - $newver", 7);
+                       daemon_log("DEBUG: Found debconf templates in '$package' - $newver", 7);
 
-                       my $tmpl= "";
-                       {
+                       my $tmpl= ""; {
                                local $/=undef;
                                open FILE, "$dir/DEBIAN/templates";
                                $tmpl = &encode_base64(<FILE>);
@@ -3019,11 +3156,11 @@ sub cleanup_and_extract {
                        rmtree("$dir/DEBIAN/templates");
 
                        $sql= "update $main::packages_list_tn set template = '$tmpl' where package = '$package' and version = '$newver';";
-               push @packages_list_statements, $sql;
+                       push @packages_list_statements, $sql;
                }
-    }
+       }
 
-    return;
+       return;
 }
 
 
@@ -3149,74 +3286,113 @@ daemon_log("$0 started!", 1);
 daemon_log("status: $server_status", 1);
 daemon_log($server_status_hash->{$server_status}.": $server_revision", 1); 
 
-# connect to incoming_db
-unlink($incoming_file_name);
-$incoming_db = GOSA::DBsqlite->new($incoming_file_name);
-$incoming_db->create_table($incoming_tn, \@incoming_col_names);
+{
+    no strict "refs";
 
-# connect to gosa-si job queue
-unlink($job_queue_file_name);  ## just for debugging
-$job_db = GOSA::DBsqlite->new($job_queue_file_name);
-$job_db->create_table($job_queue_tn, \@job_queue_col_names);
-chmod(0660, $job_queue_file_name);
-chown($root_uid, $adm_gid, $job_queue_file_name);
+    if ($db_module eq "DBmysql") {
+        # connect to incoming_db
+        $incoming_db = ("GOSA::".$db_module)->new($main::mysql_database, $main::mysql_host, $main::mysql_username, $main::mysql_password);
 
-# connect to known_clients_db
-unlink($known_clients_file_name);   ## just for debugging
-$known_clients_db = GOSA::DBsqlite->new($known_clients_file_name);
-$known_clients_db->create_table($known_clients_tn, \@known_clients_col_names);
-chmod(0660, $known_clients_file_name);
-chown($root_uid, $adm_gid, $known_clients_file_name);
+        # connect to gosa-si job queue
+        $job_db = ("GOSA::".$db_module)->new($main::mysql_database, $main::mysql_host, $main::mysql_username, $main::mysql_password);
 
-# connect to foreign_clients_db
-unlink($foreign_clients_file_name);
-$foreign_clients_db = GOSA::DBsqlite->new($foreign_clients_file_name);
-$foreign_clients_db->create_table($foreign_clients_tn, \@foreign_clients_col_names);
-chmod(0660, $foreign_clients_file_name);
-chown($root_uid, $adm_gid, $foreign_clients_file_name);
+        # connect to known_clients_db
+        $known_clients_db = ("GOSA::".$db_module)->new($main::mysql_database, $main::mysql_host, $main::mysql_username, $main::mysql_password);
 
-# connect to known_server_db
-unlink($known_server_file_name);
-$known_server_db = GOSA::DBsqlite->new($known_server_file_name);
-$known_server_db->create_table($known_server_tn, \@known_server_col_names);
-chmod(0660, $known_server_file_name);
-chown($root_uid, $adm_gid, $known_server_file_name);
+        # connect to foreign_clients_db
+        $foreign_clients_db = ("GOSA::".$db_module)->new($main::mysql_database, $main::mysql_host, $main::mysql_username, $main::mysql_password);
 
-# connect to login_usr_db
-unlink($login_users_file_name);
-$login_users_db = GOSA::DBsqlite->new($login_users_file_name);
-$login_users_db->create_table($login_users_tn, \@login_users_col_names);
-chmod(0660, $login_users_file_name);
-chown($root_uid, $adm_gid, $login_users_file_name);
+        # connect to known_server_db
+        $known_server_db = ("GOSA::".$db_module)->new($main::mysql_database, $main::mysql_host, $main::mysql_username, $main::mysql_password);
 
-# connect to fai_server_db 
-unlink($fai_server_file_name);
-$fai_server_db = GOSA::DBsqlite->new($fai_server_file_name);
-$fai_server_db->create_table($fai_server_tn, \@fai_server_col_names);
-chmod(0660, $fai_server_file_name);
-chown($root_uid, $adm_gid, $fai_server_file_name);
+        # connect to login_usr_db
+        $login_users_db = ("GOSA::".$db_module)->new($main::mysql_database, $main::mysql_host, $main::mysql_username, $main::mysql_password);
 
-# connect to fai_release_db
-unlink($fai_release_file_name);
-$fai_release_db = GOSA::DBsqlite->new($fai_release_file_name);
-$fai_release_db->create_table($fai_release_tn, \@fai_release_col_names);
-chmod(0660, $fai_release_file_name);
-chown($root_uid, $adm_gid, $fai_release_file_name);
+        # connect to fai_server_db 
+        $fai_server_db = ("GOSA::".$db_module)->new($main::mysql_database, $main::mysql_host, $main::mysql_username, $main::mysql_password);
 
-# connect to packages_list_db
-#unlink($packages_list_file_name);
-unlink($packages_list_under_construction);
-$packages_list_db = GOSA::DBsqlite->new($packages_list_file_name);
-$packages_list_db->create_table($packages_list_tn, \@packages_list_col_names);
-chmod(0660, $packages_list_file_name);
-chown($root_uid, $adm_gid, $packages_list_file_name);
+        # connect to fai_release_db
+        $fai_release_db = ("GOSA::".$db_module)->new($main::mysql_database, $main::mysql_host, $main::mysql_username, $main::mysql_password);
+
+        # connect to packages_list_db
+        $packages_list_db = ("GOSA::".$db_module)->new($main::mysql_database, $main::mysql_host, $main::mysql_username, $main::mysql_password);
+
+        # connect to messaging_db
+        $messaging_db = ("GOSA::".$db_module)->new($main::mysql_database, $main::mysql_host, $main::mysql_username, $main::mysql_password);
+
+    } elsif ($db_module eq "DBsqlite") {
+        # connect to incoming_db
+        unlink($incoming_file_name);
+        $incoming_db = GOSA::DBsqlite->new($incoming_file_name);
+        
+        # connect to gosa-si job queue
+        unlink($job_queue_file_name);  ## just for debugging
+        $job_db = GOSA::DBsqlite->new($job_queue_file_name);
+        chmod(0660, $job_queue_file_name);
+        chown($root_uid, $adm_gid, $job_queue_file_name);
+        
+        # connect to known_clients_db
+        unlink($known_clients_file_name);   ## just for debugging
+        $known_clients_db = GOSA::DBsqlite->new($known_clients_file_name);
+        chmod(0660, $known_clients_file_name);
+        chown($root_uid, $adm_gid, $known_clients_file_name);
+        
+        # connect to foreign_clients_db
+        unlink($foreign_clients_file_name);
+        $foreign_clients_db = GOSA::DBsqlite->new($foreign_clients_file_name);
+        chmod(0660, $foreign_clients_file_name);
+        chown($root_uid, $adm_gid, $foreign_clients_file_name);
+        
+        # connect to known_server_db
+        unlink($known_server_file_name);
+        $known_server_db = GOSA::DBsqlite->new($known_server_file_name);
+        chmod(0660, $known_server_file_name);
+        chown($root_uid, $adm_gid, $known_server_file_name);
+        
+        # connect to login_usr_db
+        unlink($login_users_file_name);
+        $login_users_db = GOSA::DBsqlite->new($login_users_file_name);
+        chmod(0660, $login_users_file_name);
+        chown($root_uid, $adm_gid, $login_users_file_name);
+        
+        # connect to fai_server_db
+        unlink($fai_server_file_name);
+        $fai_server_db = GOSA::DBsqlite->new($fai_server_file_name);
+        chmod(0660, $fai_server_file_name);
+        chown($root_uid, $adm_gid, $fai_server_file_name);
+        
+        # connect to fai_release_db
+        unlink($fai_release_file_name);
+        $fai_release_db = GOSA::DBsqlite->new($fai_release_file_name);
+        chmod(0660, $fai_release_file_name);
+        chown($root_uid, $adm_gid, $fai_release_file_name);
+        
+        # connect to packages_list_db
+        #unlink($packages_list_file_name);
+        unlink($packages_list_under_construction);
+        $packages_list_db = GOSA::DBsqlite->new($packages_list_file_name);
+        chmod(0660, $packages_list_file_name);
+        chown($root_uid, $adm_gid, $packages_list_file_name);
+        
+        # connect to messaging_db
+        unlink($messaging_file_name);
+        $messaging_db = GOSA::DBsqlite->new($messaging_file_name);
+        chmod(0660, $messaging_file_name);
+        chown($root_uid, $adm_gid, $messaging_file_name);
+    }
+}
 
-# connect to messaging_db
-unlink($messaging_file_name);
-$messaging_db = GOSA::DBsqlite->new($messaging_file_name);
+# Creating tables
 $messaging_db->create_table($messaging_tn, \@messaging_col_names);
-chmod(0660, $messaging_file_name);
-chown($root_uid, $adm_gid, $messaging_file_name);
+$packages_list_db->create_table($packages_list_tn, \@packages_list_col_names);
+$fai_release_db->create_table($fai_release_tn, \@fai_release_col_names);
+$fai_server_db->create_table($fai_server_tn, \@fai_server_col_names);
+$login_users_db->create_table($login_users_tn, \@login_users_col_names);
+$known_server_db->create_table($known_server_tn, \@known_server_col_names);
+$foreign_clients_db->create_table($foreign_clients_tn, \@foreign_clients_col_names);
+$known_clients_db->create_table($known_clients_tn, \@known_clients_col_names);
+$incoming_db->create_table($incoming_tn, \@incoming_col_names);
+$job_db->create_table($job_queue_tn, \@job_queue_col_names);
 
 
 # create xml object used for en/decrypting
@@ -3312,25 +3488,27 @@ if ($opsi_enabled eq "true") {
 
 
 POE::Component::Server::TCP->new(
-    Alias => "TCP_SERVER",
+       Alias => "TCP_SERVER",
        Port => $server_port,
        ClientInput => sub {
-        my ($kernel, $input) = @_[KERNEL, ARG0];
-        push(@tasks, $input);
-        push(@msgs_to_decrypt, $input);
-        $kernel->yield("msg_to_decrypt");
-        },
-    InlineStates => {
-        msg_to_decrypt => \&msg_to_decrypt,
-        next_task => \&next_task,
-        task_result => \&handle_task_result,
-        task_done   => \&handle_task_done,
-        task_debug  => \&handle_task_debug,
-        child_reap => sub { "Do nothing special. I'm just a comment, but i'm necessary!"  },
-    }
+               my ($kernel, $input, $heap, $session) = @_[KERNEL, ARG0, HEAP, SESSION];
+        my $session_id = $session->ID;
+        my $remote_ip = $heap->{'remote_ip'};
+               push(@msgs_to_decrypt, $input);
+        &daemon_log("$session_id DEBUG: incoming message from '$remote_ip'", 7);
+               $kernel->yield("msg_to_decrypt");
+       },
+       InlineStates => {
+               msg_to_decrypt => \&msg_to_decrypt,
+               next_task => \&next_task,
+               task_result => \&handle_task_result,
+               task_done   => \&handle_task_done,
+               task_debug  => \&handle_task_debug,
+               child_reap => sub { "Do nothing special. I'm just a comment, but i'm necessary!"  },
+       }
 );
 
-daemon_log("start socket for incoming xml messages at port '$server_port' ", 1);
+daemon_log("0 INFO: start socket for incoming xml messages at port '$server_port' ", 1);
 
 # create session for repeatedly checking the job queue for jobs
 POE::Session->create(