Code

Corrected check_pid
[gosa.git] / gosa-si / gosa-si-server
index f0deffab049cfce1549e8ed01e14413fc96392af..c279c7943032a6ed60a22692b090b771be8ac7b6 100755 (executable)
@@ -25,7 +25,7 @@ use warnings;
 use Getopt::Long;
 use Config::IniFiles;
 use POSIX;
-use Time::HiRes qw( gettimeofday );
+use utf8;
 
 use Fcntl;
 use IO::Socket::INET;
@@ -40,29 +40,32 @@ use Data::Dumper;
 use Sys::Syslog qw( :DEFAULT setlogsock);
 use Cwd;
 use File::Spec;
+use File::Basename;
+use File::Path;
 use GOSA::DBsqlite;
-use POE qw(Component::Server::TCP);
+use GOSA::GosaSupportDaemon;
+use POE qw(Component::Server::TCP Wheel::Run Filter::Reference);
+use Net::LDAP;
+use Net::LDAP::Util qw(:escape);
 
 my $modules_path = "/usr/lib/gosa-si/modules";
 use lib "/usr/lib/gosa-si/modules";
 
 my (%cfg_defaults, $foreground, $verbose, $ping_timeout);
-my ($bus, $msg_to_bus, $bus_cipher);
-my ($server, $server_mac_address, $server_events);
-my ($gosa_server, $job_queue_timeout, $job_queue_table_name, $job_queue_file_name,$job_queue_loop_delay);
-my ($known_modules, $known_clients_file_name, $known_server_file_name);
-my ($max_clients);
+my ($bus_activ, $bus, $msg_to_bus, $bus_cipher);
+my ($server, $server_mac_address);
+my ($gosa_server, $job_queue_timeout, $job_queue_loop_delay);
+my ($known_modules);
 my ($pid_file, $procid, $pid, $log_file);
-my (%free_child, %busy_child, $child_max, $child_min, %child_alive_time, $child_timeout);
-my ($arp_activ, $arp_fifo, $arp_fifo_path);
+my ($arp_activ, $arp_fifo);
 my ($xml);
-
+my $sources_list;
+my $max_clients;
 # variables declared in config file are always set to 'our'
 our (%cfg_defaults, $log_file, $pid_file, 
-    $bus_activ, $bus_passwd, $bus_ip, $bus_port,
-    $server_activ, $server_ip, $server_port, $SIPackages_key, $max_clients,
-    $arp_activ, $arp_fifo_path,
-    $gosa_activ, $GosaPackages_key, $gosa_ip, $gosa_port, $gosa_timeout,
+    $server_ip, $server_port, $SIPackages_key, 
+    $arp_activ, $gosa_unit_tag,
+    $GosaPackages_key, $gosa_ip, $gosa_port, $gosa_timeout,
 );
 
 # additional variable which should be globaly accessable
@@ -74,6 +77,8 @@ our $no_arp;
 our $verbose;
 our $forground;
 our $cfg_file;
+our ($ldap_handle, $ldap_uri, $ldap_base, $ldap_admin_dn, $ldap_admin_password );
+
 
 # specifies the verbosity of the daemon_log
 $verbose = 0 ;
@@ -85,56 +90,100 @@ $foreground = 0 ;
 $ping_timeout = 5;
 
 $no_bus = 0;
+$bus_activ = "true";
 
 $no_arp = 0;
 
-# name of table for storing gosa jobs
-our $job_queue_table_name = 'jobs';
+our $prg= basename($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", "timestamp", "status", "result", "progress INTEGER", 
+        "headertag", "targettag", "xmlmessage", "macaddress");
 
 # holds all other gosa-sd as well as the gosa-sd-bus
 our $known_server_db;
+our $known_server_tn = "known_server";
+my $known_server_file_name;
+my @known_server_col_names = ('hostname', 'status', 'hostkey', 'timestamp');
 
 # holds all registrated clients
 our $known_clients_db;
-
-%cfg_defaults =
-("general" =>
-    {"log_file" => [\$log_file, "/var/run/".$0.".log"],
-    "pid_file" => [\$pid_file, "/var/run/".$0.".pid"],
-    "child_max" => [\$child_max, 10],
-    "child_min" => [\$child_min, 3],
-    "child_timeout" => [\$child_timeout, 180],
-    "job_queue_timeout" => [\$job_queue_timeout, undef],
-    "job_queue_file_name" => [\$job_queue_file_name, '/var/lib/gosa-si/jobs.db'],
-    "job_queue_loop_delay" => [\$job_queue_loop_delay, 3],
-    "known_clients_file_name" => [\$known_clients_file_name, '/var/lib/gosa-si/known_clients.db' ],
-    "known_server_file_name" => [\$known_server_file_name, '/var/lib/gosa-si/known_server.db'],
-   },
-"bus" =>
-    {"bus_activ" => [\$bus_activ, "on"],
-    "bus_passwd" => [\$bus_passwd, ""],
-    "bus_ip" => [\$bus_ip, "0.0.0.0"],
-    "bus_port" => [\$bus_port, "20080"],
+our $known_clients_tn = "known_clients";
+my $known_clients_file_name;
+my @known_clients_col_names = ('hostname', 'status', 'hostkey', 'timestamp', 'macaddress', 'events');
+
+# 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');
+
+# 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', 'tag'); 
+our $fai_release_tn = "fai_release"; 
+our @fai_release_col_names = ('timestamp', 'release', 'class', 'type', 'state'); 
+
+# 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');
+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 = ('subject', 'from', 'to', 'flag', 'direction', 'delivery_time', 'message', 'timestamp', 'id INTEGER', );
+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 while max_clients are reached
+my @tasks = qw();
+
+%cfg_defaults = (
+"general" => {
+    "log-file" => [\$log_file, "/var/run/".$prg.".log"],
+    "pid-file" => [\$pid_file, "/var/run/".$prg.".pid"],
     },
-"server" =>
-    {"server_activ" => [\$server_activ, "on"],
-    "server_ip" => [\$server_ip, "0.0.0.0"],
-    "server_port" => [\$server_port, "20081"],
-    "SIPackages_key" => [\$SIPackages_key, "none"],
-    "max_clients" => [\$max_clients, 100],
+"bus" => {
+    "activ" => [\$bus_activ, "true"],
     },
-"arp" =>
-    {"arp_activ" => [\$arp_activ, "on"],
-    "arp_fifo_path" => [\$arp_fifo_path, "/var/run/gosa-si/arp-notify"],
+"server" => {
+    "port" => [\$server_port, "20081"],
+    "known-clients" => [\$known_clients_file_name, '/var/lib/gosa-si/clients.db' ],
+    "known-servers" => [\$known_server_file_name, '/var/lib/gosa-si/servers.db'],
+    "login-users" => [\$login_users_file_name, '/var/lib/gosa-si/users.db'],
+    "fai-server" => [\$fai_server_file_name, '/var/lib/gosa-si/fai.db'],
+    "packages-list" => [\$packages_list_file_name, '/var/lib/gosa-si/packages.db'],
+    "messaging" => [\$messaging_file_name, '/var/lib/gosa-si/messaging.db'],
+    "source-list" => [\$sources_list, '/etc/apt/sources.list'],
+    "ldap-uri" => [\$ldap_uri, ""],
+    "ldap-base" => [\$ldap_base, ""],
+    "ldap-admin-dn" => [\$ldap_admin_dn, ""],
+    "ldap-admin-password" => [\$ldap_admin_password, ""],
+    "gosa-unit-tag" => [\$gosa_unit_tag, ""],
+    "max-clients" => [\$max_clients, 10],
     },
-"gosa" =>
-    {"gosa_activ" => [\$gosa_activ, "on"],
-    "gosa_ip" => [\$gosa_ip, "0.0.0.0"],
-    "gosa_port" => [\$gosa_port, "20082"],
-    "GosaPackages_key" => [\$GosaPackages_key, "none"],
+"GOsaPackages" => {
+    "ip" => [\$gosa_ip, "0.0.0.0"],
+    "port" => [\$gosa_port, "20082"],
+    "job-queue" => [\$job_queue_file_name, '/var/lib/gosa-si/jobs.db'],
+    "job-queue-loop-delay" => [\$job_queue_loop_delay, 3],
+    "key" => [\$GosaPackages_key, "none"],
     },
-    );
+"SIPackages" => {
+    "key" => [\$SIPackages_key, "none"],
+    },
+);
 
 
 #===  FUNCTION  ================================================================
@@ -145,14 +194,14 @@ our $known_clients_db;
 #===============================================================================
 sub usage {
     print STDERR << "EOF" ;
-usage: $0 [-hvf] [-c config]
+usage: $prg [-hvf] [-c config]
 
            -h        : this (help) message
            -c <file> : config file
            -f        : foreground, process will not be forked to background
            -v        : be verbose (multiple to increase verbosity)
-           -no-bus   : starts $0 without connection to bus
-           -no-arp   : starts $0 without connection to arp module
+           -no-bus   : starts $prg without connection to bus
+           -no-arp   : starts $prg without connection to arp module
  
 EOF
     print "\n" ;
@@ -210,12 +259,11 @@ sub daemon_log {
                 $hours = $hours < 10 ? $hours = "0".$hours : $hours;
                 $minutes = $minutes < 10 ? $minutes = "0".$minutes : $minutes;
                 $seconds = $seconds < 10 ? $seconds = "0".$seconds : $seconds;
-                my @monthnames = ("Jan", "Feb", "Mar", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec");
+                my @monthnames = ("Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec");
                 $month = $monthnames[$month];
                 $monthday = $monthday < 10 ? $monthday = "0".$monthday : $monthday;
                 $year+=1900;
-                my $name = $0;
-                $name =~ s/\.\///;
+                my $name = $prg;
 
                 my $log_msg = "$month $monthday $hours:$minutes:$seconds $name $msg\n";
                 print LOG_HANDLE $log_msg;
@@ -225,30 +273,6 @@ sub daemon_log {
             }
         close( LOG_HANDLE );
     }
-#log into syslog
-#    my ($msg, $level, $facility) = @_;
-#    if(not defined $msg) {return}
-#    if(not defined $level) {$level = "info"}
-#    if(not defined $facility) {$facility = "LOG_DAEMON"}
-#    openlog($0, "pid,cons,", $facility);
-#    syslog($level, $msg);
-#    closelog;
-#    return;
-}
-
-
-sub get_time {
-    my ($seconds, $minutes, $hours, $monthday, $month,
-            $year, $weekday, $yearday, $sommertime) = localtime(time);
-    $hours = $hours < 10 ? $hours = "0".$hours : $hours;
-    $minutes = $minutes < 10 ? $minutes = "0".$minutes : $minutes;
-    $seconds = $seconds < 10 ? $seconds = "0".$seconds : $seconds;
-    $month+=1;
-    $month = $month < 10 ? $month = "0".$month : $month;
-    $monthday = $monthday < 10 ? $monthday = "0".$monthday : $monthday;
-    $year+=1900;
-    return "$year$month$monthday$hours$minutes$seconds";
-
 }
 
 
@@ -292,7 +316,8 @@ sub check_pid {
             chomp( $pid );
             if( -f "/proc/$pid/stat" ) {
                 my($stat) = `cat /proc/$pid/stat` =~ m/$pid \((.+)\).*/;
-                if( $0 eq $stat ) {
+                if( $stat ) {
+                                       daemon_log("ERROR: Already running",1);
                     close( LOCK_FILE );
                     exit -1;
                 }
@@ -360,10 +385,10 @@ sub import_modules {
                } else {
                        my $info = eval($mod_name.'::get_module_info()');
                        # Only load module if get_module_info() returns a non-null object
-                       if(defined($info)) {
+                       if( $info ) {
                                my ($input_address, $input_key, $input, $input_active, $input_type) = @{$info};
                                $known_modules->{$mod_name} = $info;
-                               daemon_log("module $mod_name loaded", 1);
+                               daemon_log("INFO: module $mod_name loaded", 5);
                        }
                }
     }   
@@ -380,8 +405,12 @@ sub import_modules {
 sub sig_int_handler {
     my ($signal) = @_;
 
+       if(defined($ldap_handle)) {
+               $ldap_handle->disconnect;
+       }
+
     daemon_log("shutting down gosa-si-server", 1);
-    exit(1);
+    exit(0);
 }
 $SIG{INT} = \&sig_int_handler;
 
@@ -389,55 +418,111 @@ $SIG{INT} = \&sig_int_handler;
 
 sub check_key_and_xml_validity {
     my ($crypted_msg, $module_key) = @_;
-#print STDERR "crypted_msg:$crypted_msg\n";
-#print STDERR "modul:$module\n";
-#print STDERR "modul_key:$module_key\n";
-
     my $msg;
     my $msg_hash;
+    my $error_string;
     eval{
         $msg = &decrypt_msg($crypted_msg, $module_key);
-        &main::daemon_log("decrypted_msg: \n$msg", 8);
 
+        if ($msg =~ /<xml>/i){
+            daemon_log("decrypted_msg: \n$msg", 8);
+            $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} ) { die 'more than one header specified'; }
+            my $header = @{$header_l}[0];
+            if( 0 == length $header) { die 'empty string in header tag'; }
+
+            ##############
+            # 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} ) { die 'more than one source specified'; }
+            my $source = @{$source_l}[0];
+            if( 0 == length $source) { die 'source error'; }
+
+            ##############
+            # 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($@) {
+        daemon_log("WARNING: do not understand the message: $@", 5);
+        $msg = undef;
+        $msg_hash = undef;
+    }
+
+    return ($msg, $msg_hash);
+}
+
+
+sub check_outgoing_xml_validity {
+    my ($msg) = @_;
+
+    my $msg_hash;
+    eval{
         $msg_hash = $xml->XMLin($msg, ForceArray=>1);
 
+        ##############
         # check header
         my $header_l = $msg_hash->{'header'};
         if( 1 != @{$header_l} ) {
-            die'header error';
+            die 'no or more than one headers specified';
         }
         my $header = @{$header_l}[0];
         if( 0 == length $header) {
-            die 'header error';
+            die 'header has length 0';
         }
 
+        ##############
         # check source
         my $source_l = $msg_hash->{'source'};
         if( 1 != @{$source_l} ) {
-            die'source error';
+            die 'no or more than 1 sources specified';
         }
         my $source = @{$source_l}[0];
         if( 0 == length $source) {
-            die 'source error';
+            die 'source has length 0';
         }
-
-        # check target
+        unless( $source =~ /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}:\d+$/ ||
+                $source =~ /^GOSA$/i ) {
+            die "source '$source' is neither a complete ip-address with port nor 'GOSA'";
+        }
+        
+        ##############
+        # check target  
         my $target_l = $msg_hash->{'target'};
-        if( 1 != @{$target_l} ) {
-            die'target error';
+        if( 0 == @{$target_l} ) {
+            die "no targets specified";
         }
-        my $target = @{$target_l}[0];
-        if( 0 == length $target) {
-            die 'target error';
+        foreach my $target (@$target_l) {
+            if( 0 == length $target) {
+                die "target has length 0";
+            }
+            unless( $target =~ /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}:\d+$/ ||
+                    $target =~ /^GOSA$/i ||
+                    $target =~ /^\*$/ ||
+                    $target =~ /KNOWN_SERVER/i ||
+                    $target =~ /JOBDB/i ||
+                    $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 ){
+                die "target '$target' is not a complete ip-address with port or a valid target name or a mac-address";
+            }
         }
-
     };
     if($@) {
-        &main::daemon_log("WARNING: do not understand the message:", 5);
-        &main::daemon_log("$@", 8);
+        daemon_log("WARNING: outgoing msg is not gosa-si envelope conform", 5);
+        daemon_log("$@ ".(defined($msg) && length($msg)>0)?$msg:"Empty Message", 8);
+        $msg_hash = undef;
     }
 
-    return ($msg, $msg_hash);
+    return ($msg_hash);
 }
 
 
@@ -445,33 +530,35 @@ sub input_from_known_server {
     my ($input, $remote_ip) = @_ ;  
     my ($msg, $msg_hash, $module);
 
-    
     my $sql_statement= "SELECT * FROM known_server";
     my $query_res = $known_server_db->select_dbentry( $sql_statement ); 
+
     while( my ($hit_num, $hit) = each %{ $query_res } ) {    
         my $host_name = $hit->{hostname};
         if( not $host_name =~ "^$remote_ip") {
             next;
         }
         my $host_key = $hit->{hostkey};
-        daemon_log("SIPackages: host_name: $host_name", 7);
-        daemon_log("SIPackages: host_key: $host_key", 7);
+        daemon_log("DEBUG: input_from_known_server: host_name: $host_name", 7);
+        daemon_log("DEBUG: input_from_known_server: host_key: $host_key", 7);
 
         # check if module can open msg envelope with module key
-        my ($msg, $msg_hash) = &check_key_and_xml_validity($input, $host_key);
-        if( (!$msg) || (!$msg_hash) ) {
-            daemon_log("SIPackages: deciphering raise error", 7);
+        my ($tmp_msg, $tmp_msg_hash) = &check_key_and_xml_validity($input, $host_key);
+        if( (!$tmp_msg) || (!$tmp_msg_hash) ) {
+            daemon_log("DEBUG: input_from_known_server: deciphering raise error", 7);
             daemon_log("$@", 8);
             next;
         }
         else {
+            $msg = $tmp_msg;
+            $msg_hash = $tmp_msg_hash;
             $module = "SIPackages";
             last;
         }
     }
 
     if( (!$msg) || (!$msg_hash) || (!$module) ) {
-        daemon_log("Incoming message is not from a known server", 3);
+        daemon_log("DEBUG: Incoming message is not from a known server", 7);
     }
   
     return ($msg, $msg_hash, $module);
@@ -487,17 +574,17 @@ sub input_from_known_client {
     while( my ($hit_num, $hit) = each %{ $query_res } ) {    
         my $host_name = $hit->{hostname};
         if( not $host_name =~ /^$remote_ip:\d*$/) {
-            next;
+                next;
                }
         my $host_key = $hit->{hostkey};
-        &daemon_log("SIPackages: host_name: $host_name", 7);
-        &daemon_log("SIPackages: host_key: $host_key", 7);
+        &daemon_log("DEBUG: input_from_known_client: host_name: $host_name", 7);
+        &daemon_log("DEBUG: input_from_known_client: host_key: $host_key", 7);
 
         # check if module can open msg envelope with module key
         ($msg, $msg_hash) = &check_key_and_xml_validity($input, $host_key);
 
         if( (!$msg) || (!$msg_hash) ) {
-            &daemon_log("SIPackages: deciphering raise error", 7);
+            &daemon_log("DEGUG: input_from_known_client: deciphering raise error", 7);
             &daemon_log("$@", 8);
             next;
         }
@@ -508,7 +595,7 @@ sub input_from_known_client {
     }
 
     if( (!$msg) || (!$msg_hash) || (!$module) ) {
-        &daemon_log("Incoming message is not from a known client", 3);
+        &daemon_log("DEBUG: Incoming message is not from a known client", 7);
     }
 
     return ($msg, $msg_hash, $module);
@@ -519,22 +606,26 @@ sub input_from_unknown_host {
     no strict "refs";
     my ($input) = @_ ;
     my ($msg, $msg_hash, $module);
+    my $error_string;
     
        my %act_modules = %$known_modules;
 
        while( my ($mod, $info) = each(%act_modules)) {
+
         # check a key exists for this module
         my $module_key = ${$mod."_key"};
-        if( ! $module_key ) {
+        if( not defined $module_key ) {
+            if( $mod eq 'ArpHandler' ) {
+                next;
+            }
             daemon_log("ERROR: no key specified in config file for $mod", 1);
             next;
         }
-        daemon_log("$mod: $module_key", 5);
+        daemon_log("DEBUG: $mod: $module_key", 7);
 
         # check if module can open msg envelope with module key
         ($msg, $msg_hash) = &check_key_and_xml_validity($input, $module_key);
-        if( (!$msg) || (!$msg_hash) ) {
-            daemon_log("$mod: deciphering failed", 5);
+        if( (not defined $msg) || (not defined $msg_hash) ) {
             next;
         }
         else {
@@ -544,14 +635,18 @@ sub input_from_unknown_host {
     }
 
     if( (!$msg) || (!$msg_hash) || (!$module)) {
-        daemon_log("Incoming message is not from a unknown host", 3);
+        daemon_log("DEBUG: Incoming message is not from an unknown host", 7);
     }
 
     return ($msg, $msg_hash, $module);
 }
 
+
 sub create_ciphering {
     my ($passwd) = @_;
+       if((!defined($passwd)) || length($passwd)==0) {
+               $passwd = "";
+       }
     $passwd = substr(md5_hex("$passwd") x 32, 0, 32);
     my $iv = substr(md5_hex('GONICUS GmbH'),0, 16);
     my $my_cipher = Crypt::Rijndael->new($passwd , Crypt::Rijndael::MODE_CBC());
@@ -563,10 +658,12 @@ sub create_ciphering {
 sub encrypt_msg {
     my ($msg, $key) = @_;
     my $my_cipher = &create_ciphering($key);
+    my $len;
     {
-      use bytes;
-      $msg = "\0"x(16-length($msg)%16).$msg;
+           use bytes;
+           $len= 16-length($msg)%16;
     }
+    $msg = "\0"x($len).$msg;
     $msg = $my_cipher->encrypt($msg);
     chomp($msg = &encode_base64($msg));
     # there are no newlines allowed inside msg
@@ -576,6 +673,7 @@ sub encrypt_msg {
 
 
 sub decrypt_msg {
+
     my ($msg, $key) = @_ ;
     $msg = &decode_base64($msg);
     my $my_cipher = &create_ciphering($key);
@@ -591,23 +689,22 @@ sub get_encrypt_key {
     my $error = 0;
 
     # target can be in known_server
-    if( !$encrypt_key ) {
-        my $sql_statement= "SELECT * FROM known_server";
+    if( not defined $encrypt_key ) {
+        my $sql_statement= "SELECT * FROM known_server WHERE hostname='$target'";
         my $query_res = $known_server_db->select_dbentry( $sql_statement ); 
         while( my ($hit_num, $hit) = each %{ $query_res } ) {    
             my $host_name = $hit->{hostname};
             if( $host_name ne $target ) {
                 next;
             }
-            my $host_key = $hit->{hostkey};
+            $encrypt_key = $hit->{hostkey};
             last;
         }
     }
-   
 
     # target can be in known_client
-    if( !$encrypt_key ) {
-        my $sql_statement= "SELECT * FROM known_clients";
+    if( not defined $encrypt_key ) {
+        my $sql_statement= "SELECT * FROM known_clients WHERE hostname='$target'";
         my $query_res = $known_clients_db->select_dbentry( $sql_statement ); 
         while( my ($hit_num, $hit) = each %{ $query_res } ) {    
             my $host_name = $hit->{hostname};
@@ -644,69 +741,459 @@ sub open_socket {
     if(not defined $socket) {
         return;
     }
-    &daemon_log("open_socket: $PeerAddr", 7);
+#    &daemon_log("DEBUG: open_socket: $PeerAddr", 7);
     return $socket;
 }
 
 
+#===  FUNCTION  ================================================================
+#         NAME:  get_ip 
+#   PARAMETERS:  interface name (i.e. eth0)
+#      RETURNS:  (ip address) 
+#  DESCRIPTION:  Uses ioctl to get ip address directly from system.
+#===============================================================================
+sub get_ip {
+       my $ifreq= shift;
+       my $result= "";
+       my $SIOCGIFADDR= 0x8915;       # man 2 ioctl_list
+       my $proto= getprotobyname('ip');
+
+       socket SOCKET, PF_INET, SOCK_DGRAM, $proto
+               or die "socket: $!";
+
+       if(ioctl SOCKET, $SIOCGIFADDR, $ifreq) {
+               my ($if, $sin)    = unpack 'a16 a16', $ifreq;
+               my ($port, $addr) = sockaddr_in $sin;
+               my $ip            = inet_ntoa $addr;
+
+               if ($ip && length($ip) > 0) {
+                       $result = $ip;
+               }
+       }
+
+       return $result;
+}
+
+
+sub get_local_ip_for_remote_ip {
+       my $remote_ip= shift;
+       my $result="0.0.0.0";
+
+       if($remote_ip =~ /^(\d\d?\d?\.){3}\d\d?\d?$/) {
+               if($remote_ip eq "127.0.0.1") {
+                       $result = "127.0.0.1";
+               } else {
+                       my $PROC_NET_ROUTE= ('/proc/net/route');
+
+                       open(PROC_NET_ROUTE, "<$PROC_NET_ROUTE")
+                               or die "Could not open $PROC_NET_ROUTE";
+
+                       my @ifs = <PROC_NET_ROUTE>;
+
+                       close(PROC_NET_ROUTE);
+
+                       # Eat header line
+                       shift @ifs;
+                       chomp @ifs;
+                       foreach my $line(@ifs) {
+                               my ($Iface,$Destination,$Gateway,$Flags,$RefCnt,$Use,$Metric,$Mask,$MTU,$Window,$IRTT)=split(/\s/, $line);
+                               my $destination;
+                               my $mask;
+                               my ($d,$c,$b,$a)=unpack('a2 a2 a2 a2', $Destination);
+                               $destination= sprintf("%d.%d.%d.%d", hex($a), hex($b), hex($c), hex($d));
+                               ($d,$c,$b,$a)=unpack('a2 a2 a2 a2', $Mask);
+                               $mask= sprintf("%d.%d.%d.%d", hex($a), hex($b), hex($c), hex($d));
+                               if(new NetAddr::IP($remote_ip)->within(new NetAddr::IP($destination, $mask))) {
+                                       # destination matches route, save mac and exit
+                                       $result= &get_ip($Iface);
+                                       last;
+                               }
+                       }
+               }
+       } else {
+               daemon_log("get_local_ip_for_remote_ip was called with a non-ip parameter: $remote_ip", 1);
+       }
+       return $result;
+}
+
+
 sub send_msg_to_target {
     my ($msg, $address, $encrypt_key, $msg_header) = @_ ;
     my $error = 0;
-
-    if( !$msg_header ) {
-        $msg_header = "";
+    my $header;
+    my $new_status;
+    my $act_status;
+    my ($sql_statement, $res);
+  
+    if( $msg_header ) {
+        $header = "'$msg_header'-";
+    } else {
+        $header = "";
     }
 
+       # Patch the source ip
+       if($msg =~ /<source>0\.0\.0\.0:\d*?<\/source>/) {
+               my $remote_ip = &get_local_ip_for_remote_ip(sprintf("%s", $address =~ /^([0-9\.]*?):.*$/));
+               $msg =~ s/<source>(0\.0\.0\.0):(\d*?)<\/source>/<source>$remote_ip:$2<\/source>/s;
+       }
+
     # encrypt xml msg
     my $crypted_msg = &encrypt_msg($msg, $encrypt_key);
 
     # opensocket
     my $socket = &open_socket($address);
-    if(not defined $socket){
-        daemon_log("cannot send $msg_header msg to $address , host not reachable", 1);
+    if( !$socket ) {
+        daemon_log("ERROR: cannot send ".$header."msg to $address , host not reachable", 1);
         $error++;
     }
     
     if( $error == 0 ) {
-
         # send xml msg
         print $socket $crypted_msg."\n";
 
+        daemon_log("INFO: send ".$header."msg to $address", 5);
+        daemon_log("message:\n$msg", 8);
+        
+    }
+
+    # close socket in any case
+    if( $socket ) {
         close $socket;
+    }
+
+    if( $error > 0 ) { $new_status = "down"; }
+    else { $new_status = $msg_header; }
+
+
+    # known_clients
+    $sql_statement = "SELECT * FROM known_clients WHERE hostname='$address'";
+    $res = $known_clients_db->select_dbentry($sql_statement);
+    if( keys(%$res) > 0) {
+        $act_status = $res->{1}->{'status'};
+        if( $act_status eq "down" ) {
+            $sql_statement = "DELETE FROM known_clients WHERE hostname='$address'";
+            $res = $known_clients_db->del_dbentry($sql_statement);
+            daemon_log("WARNING: failed 2x to send msg to host '$address', delete host from known_clients", 3);
+        } else { 
+            $sql_statement = "UPDATE known_clients SET status='$new_status' WHERE hostname='$address'";
+            $res = $known_clients_db->update_dbentry($sql_statement);
+            if($new_status eq "down"){
+                daemon_log("WARNING: set '$address' from status '$act_status' to '$new_status'", 3);
+            } else {
+                daemon_log("INFO: set '$address' from status '$act_status' to '$new_status'", 5);
+            }
+        }
+    }
+
+    # known_server
+    $sql_statement = "SELECT * FROM known_server WHERE hostname='$address'";
+    $res = $known_server_db->select_dbentry($sql_statement);
+    if( keys(%$res) > 0 ) {
+        $act_status = $res->{1}->{'status'};
+        if( $act_status eq "down" ) {
+            $sql_statement = "DELETE FROM known_server WHERE hostname='$address'";
+            $res = $known_server_db->del_dbentry($sql_statement);
+            daemon_log("WARNING: failed 2x to a send msg to host '$address', delete host from known_server", 3);
+        } 
+        else { 
+            $sql_statement = "UPDATE known_server SET status='$new_status' WHERE hostname='$address'";
+            $res = $known_server_db->update_dbentry($sql_statement);
+            if($new_status eq "down"){
+                daemon_log("WARNING: set '$address' from status '$act_status' to '$new_status'", 3);
+            }
+            else {
+                daemon_log("INFO: set '$address' from status '$act_status' to '$new_status'", 5);
+            }
+        }
+    }
+    return $error; 
+}
+
+
+sub update_jobdb_status_for_send_msgs {
+    my ($answer, $error) = @_;
+    if( $answer =~ /<jobdb_id>(\d+)<\/jobdb_id>/ ) {
+        my $jobdb_id = $1;
+        if( $error ) {
+            if (not $answer =~ /<header>trigger_action_reinstall<\/header>/) {
+                # sending msg faild
+                my $sql_statement = "UPDATE $job_queue_tn ".
+                    "SET status='error', result='can not deliver msg, please consult log file' ".
+                    "WHERE id='$jobdb_id'";
+                my $res = $job_db->update_dbentry($sql_statement);
+            }
+        } else {
+            # sending msg was successful
+            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);
+        }
+    }
+}
 
-        daemon_log("send msg to $address", 1);
-        daemon_log("message:\n$msg", 8);
 
+sub _start {
+    my ($kernel) = $_[KERNEL];
+    &trigger_db_loop($kernel);
+    $kernel->yield('create_fai_server_db', $fai_server_tn );
+       $kernel->yield('create_fai_release_db', $fai_release_tn );
+    $kernel->yield('create_packages_list_db', $sources_list );
+}
+
+
+sub next_tasks {
+    my ($session, $heap) = @_[SESSION, HEAP];
+
+    while ( keys( %{ $heap->{task} } ) < $max_clients ) {
+        my $next_task = shift @tasks;
+        last unless defined $next_task;
+
+        my $task = POE::Wheel::Run->new(
+                Program => sub { process_task($session, $heap, $next_task) },
+                StdoutFilter => POE::Filter::Reference->new(),
+                StdoutEvent  => "task_result",
+                StderrEvent  => "task_debug",
+                CloseEvent   => "task_done",
+                );
+
+        $heap->{task}->{ $task->ID } = $task;
+    }
+}
+sub handle_task_result {
+    my ($kernel, $heap, $client_answer) = @_[KERNEL, HEAP, ARG0];    
+    if( $client_answer =~ s/session_id=(\d+)$// ) {
+        my $session_id = $1;
+        if( defined $session_id ) {
+            my $session_reference = $kernel->ID_id_to_session($session_id);
+            if( defined $session_reference ) {
+                $heap = $session_reference->get_heap();
+            }
+        }     
+    }
+    $heap->{client}->put($client_answer);
+    $kernel->sig(CHLD => "child_reap");
+}
+sub handle_task_debug {
+    my $result = $_[ARG0];
+    print STDERR "$result\n";
+}
+
+sub handle_task_done {
+    my ( $kernel, $heap, $task_id ) = @_[ KERNEL, HEAP, ARG0 ];
+    delete $heap->{task}->{$task_id};
+    $kernel->yield("next_task");
+}
+sub process_task {
+    no strict "refs";
+    my ($session, $heap, $input) = @_;
+    my $session_id = $session->ID;
+    my ($msg, $msg_hash, $module);
+    my $error = 0;
+    my $answer_l;
+    my ($answer_header, @answer_target_l, $answer_source);
+    my $client_answer = "";
+
+    daemon_log("", 5); 
+    daemon_log("INFO: Incoming msg from '".$heap->{'remote_ip'}."'", 5);
+    daemon_log("DEBUG: Incoming msg:\n$input", 9);
+
+    ####################
+    # check incoming msg
+    # msg is from a new client or gosa
+    ($msg, $msg_hash, $module) = &input_from_unknown_host($input);
+    # msg is from a gosa-si-server or gosa-si-bus
+    if(( !$msg ) || ( !$msg_hash ) || ( !$module )){
+        ($msg, $msg_hash, $module) = &input_from_known_server($input, $heap->{'remote_ip'});
+    }
+    # msg is from a gosa-si-client
+    if(( !$msg ) || ( !$msg_hash ) || ( !$module )){
+        ($msg, $msg_hash, $module) = &input_from_known_client($input, $heap->{'remote_ip'});
+    }
+    # an error occurred
+    if(( !$msg ) || ( !$msg_hash ) || ( !$module )){
+        $error++;
+    }
+
+    ######################
+    # process incoming msg
+    if( $error == 0) {
+        daemon_log("INFO: Incoming msg with header '".@{$msg_hash->{'header'}}[0]."'", 5); 
+        daemon_log("DEBUG: Processing module ".$module, 7);
+        $answer_l = &{ $module."::process_incoming_msg" }($msg, $msg_hash, $session_id);
+
+        if ( 0 > @{$answer_l} ) {
+            my $answer_str = join("\n", @{$answer_l});
+            daemon_log("DEGUB: $module: Got answer from module: \n".$answer_str,8);
+        }
+    }
+    if( !$answer_l ) { $error++ };
+
+    ########
+    # answer
+    if( $error == 0 ) {
+
+        foreach my $answer ( @{$answer_l} ) {
+            # for each answer in answer list
+            
+            # check outgoing msg to xml validity
+            my $answer_hash = &check_outgoing_xml_validity($answer);
+            if( not defined $answer_hash ) {
+                next;
+            }
+            
+            $answer_header = @{$answer_hash->{'header'}}[0];
+            @answer_target_l = @{$answer_hash->{'target'}};
+            $answer_source = @{$answer_hash->{'source'}}[0];
+
+            # deliver msg to all targets 
+            foreach my $answer_target ( @answer_target_l ) {
+
+                # targets of msg are all gosa-si-clients in known_clients_db
+                if( $answer_target eq "*" ) {
+                    # answer is for all clients
+                    my $sql_statement= "SELECT * FROM known_clients";
+                    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 $error = &send_msg_to_target($answer, $host_name, $host_key, $answer_header);
+                        &update_jobdb_status_for_send_msgs($answer, $error);
+                    }
+                }
+
+                # targets of msg are all gosa-si-server in known_server_db
+                elsif( $answer_target eq "KNOWN_SERVER" ) {
+                    # answer is for all server in known_server
+                    my $sql_statement= "SELECT * FROM known_server";
+                    my $query_res = $known_server_db->select_dbentry( $sql_statement ); 
+                    while( my ($hit_num, $hit) = each %{ $query_res } ) {    
+                        my $host_name = $hit->{hostname};
+                        my $host_key = $hit->{hostkey};
+                        $answer =~ s/KNOWN_SERVER/$host_name/g;
+                        my $error = &send_msg_to_target($answer, $host_name, $host_key, $answer_header);
+                        &update_jobdb_status_for_send_msgs($answer, $error);
+                    }
+                }
+
+                # target of msg is GOsa
+                elsif( $answer_target eq "GOSA" ) {
+                    $answer =~ /<session_id>(\d+)<\/session_id>/;
+                    my $session_id = $1;
+                    my $add_on = "";
+                    if( defined $session_id ) {
+                        $add_on = ".session_id=$session_id";
+                    }
+                    # answer is for GOSA and has to returned to connected client
+                    my $gosa_answer = &encrypt_msg($answer, $GosaPackages_key);
+                    $client_answer = $gosa_answer.$add_on;
+                }
+
+                # target of msg is job queue at this host
+                elsif( $answer_target eq "JOBDB") {
+                    $answer =~ /<header>(\S+)<\/header>/;   
+                    my $header;
+                    if( defined $1 ) { $header = $1; }
+                    my $error = &send_msg_to_target($answer, $server_address, $GosaPackages_key, $header);
+                    &update_jobdb_status_for_send_msgs($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("INFO: target is mac address '$answer_target', looking for host in known_clients", 5);
+                    my $sql_statement = "SELECT * FROM known_clients WHERE macaddress='$answer_target'";
+                    my $query_res = $known_clients_db->select_dbentry( $sql_statement );
+                    my $found_ip_flag = 0;
+                    while( my ($hit_num, $hit) = each %{ $query_res } ) {    
+                        my $host_name = $hit->{hostname};
+                        my $host_key = $hit->{hostkey};
+                        $answer =~ s/$answer_target/$host_name/g;
+                        daemon_log("INFO: found host '$host_name', associated to '$answer_target'", 5);
+                        my $error = &send_msg_to_target($answer, $host_name, $host_key, $answer_header);
+                        &update_jobdb_status_for_send_msgs($answer, $error);
+                        $found_ip_flag++ ;
+                    }   
+                    if( $found_ip_flag == 0) {
+                        daemon_log("WARNING: no host found in known_clients with mac address '$answer_target'", 3);
+                        if( $bus_activ eq "true" ) { 
+                            daemon_log("INFO: try to forward msg '$answer_header' to bus '$bus_address'", 5);
+                            my $sql_statement = "SELECT * FROM known_server WHERE hostname='$bus_address'";
+                            my $query_res = $known_server_db->select_dbentry( $sql_statement );
+                            while( my ($hit_num, $hit) = each %{ $query_res } ) {    
+                                my $bus_address = $hit->{hostname};
+                                my $bus_key = $hit->{hostkey};
+                                my $error = &send_msg_to_target($answer, $bus_address, $bus_key, $answer_header);
+                                &update_jobdb_status_for_send_msgs($answer, $error);
+                                last;
+                            }
+                        }
+
+                    }
+
+                #  answer is for one specific host   
+                } else {
+                    # get encrypt_key
+                    my $encrypt_key = &get_encrypt_key($answer_target);
+                    if( not defined $encrypt_key ) {
+                        # unknown target, forward msg to bus
+                        daemon_log("WARNING: unknown target '$answer_target'", 3);
+                        if( $bus_activ eq "true" ) { 
+                            daemon_log("INFO: try to forward msg '$answer_header' to bus '$bus_address'", 5);
+                            my $sql_statement = "SELECT * FROM known_server WHERE hostname='$bus_address'";
+                            my $query_res = $known_server_db->select_dbentry( $sql_statement );
+                            my $res_length = keys( %{$query_res} );
+                            if( $res_length == 0 ){
+                                daemon_log("WARNING: send '$answer_header' to '$bus_address' failed, ".
+                                        "no bus found in known_server", 3);
+                            }
+                            else {
+                                while( my ($hit_num, $hit) = each %{ $query_res } ) {    
+                                    my $bus_key = $hit->{hostkey};
+                                    my $error = &send_msg_to_target($answer, $bus_address, $bus_key, $answer_header);
+                                    &update_jobdb_status_for_send_msgs($answer, $error);
+                                }
+                            }
+                        }
+                        next;
+                    }
+                    my $error = &send_msg_to_target($answer, $answer_target, $encrypt_key, $answer_header);
+                    &update_jobdb_status_for_send_msgs($answer, $error);
+                }
+            }
+        }
     }
 
+    print $client_answer;
     return;
 }
 
 
 sub client_input {
     no strict "refs";
-    my ($heap,$input,$wheel) = @_[HEAP, ARG0, ARG1];
+    my ($kernel, $session, $heap, $input, $wheel) = @_[KERNEL, SESSION, HEAP, ARG0, ARG1];
+    my $session_id = $session->ID;
     my ($msg, $msg_hash, $module);
     my $error = 0;
     my $answer_l;
     my ($answer_header, @answer_target_l, $answer_source);
     my $client_answer;
 
-    daemon_log("Incoming msg:\n$input\n", 8);
+    daemon_log("", 5); 
+    daemon_log("INFO: Incoming msg from '".$heap->{'remote_ip'}."'", 5);
+    daemon_log("DEBUG: Incoming msg:\n$input", 9);
 
+    ####################
+    # check incoming msg
     # msg is from a new client or gosa
     ($msg, $msg_hash, $module) = &input_from_unknown_host($input);
-
     # msg is from a gosa-si-server or gosa-si-bus
     if(( !$msg ) || ( !$msg_hash ) || ( !$module )){
         ($msg, $msg_hash, $module) = &input_from_known_server($input, $heap->{'remote_ip'});
     }
-
     # msg is from a gosa-si-client
     if(( !$msg ) || ( !$msg_hash ) || ( !$module )){
         ($msg, $msg_hash, $module) = &input_from_known_client($input, $heap->{'remote_ip'});
     }
-
     # an error occurred
     if(( !$msg ) || ( !$msg_hash ) || ( !$module )){
         $error++;
@@ -715,71 +1202,161 @@ sub client_input {
     ######################
     # process incoming msg
     if( $error == 0) {
-        daemon_log("Processing module ".$module, 3);
-        $answer_l = &{ $module."::process_incoming_msg" }($msg, $msg_hash);
+        daemon_log("INFO: Incoming msg with header '".@{$msg_hash->{'header'}}[0]."'", 5); 
+        daemon_log("DEBUG: Processing module ".$module, 7);
+        $answer_l = &{ $module."::process_incoming_msg" }($msg, $msg_hash, $session_id);
 
         if ( 0 > @{$answer_l} ) {
             my $answer_str = join("\n", @{$answer_l});
-            daemon_log("$module: Got answer from module: \n".$answer_str,8);
+            daemon_log("DEGUB: $module: Got answer from module: \n".$answer_str,8);
         }
     }
     if( !$answer_l ) { $error++ };
 
-    # for each answer in answer list
-    foreach my $answer ( @{$answer_l} ) {
+    ########
+    # answer
+    if( $error == 0 ) {
 
-        # check answer if gosa-si envelope conform
-        if( $error == 0 ) {
-            my $answer_hash = $xml->XMLin($answer, ForceArray=>1);
+        foreach my $answer ( @{$answer_l} ) {
+            # for each answer in answer list
+            
+            # check outgoing msg to xml validity
+            my $answer_hash = &check_outgoing_xml_validity($answer);
+            if( not defined $answer_hash ) {
+                next;
+            }
+            
             $answer_header = @{$answer_hash->{'header'}}[0];
             @answer_target_l = @{$answer_hash->{'target'}};
             $answer_source = @{$answer_hash->{'source'}}[0];
-            if( !$answer_header ) {
-                daemon_log('ERROR: module answer is not gosa-si envelope conform: no header', 1);
-                $error++;
-            }
-            if( 0 == length @answer_target_l ) {
-                daemon_log('ERROR: module answer is not gosa-si envelope conform: no targets', 1);
-                $error++;
-            }
-            if( !$answer_source ) {
-                daemon_log('ERROR: module answer is not gosa-si envelope conform: no source', 1);
-                $error++;
-            }
-        }
 
-        # deliver msg to all targets 
-        foreach my $answer_target ( @answer_target_l ) {
-            if( $answer_target eq "*" ) {
-                # answer is for all clients
-                my $sql_statement= "SELECT * FROM known_clients";
-                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};
-                    &send_msg_to_target($answer, $host_name, $host_key);
+            # deliver msg to all targets 
+            foreach my $answer_target ( @answer_target_l ) {
+
+                # targets of msg are all gosa-si-clients in known_clients_db
+                if( $answer_target eq "*" ) {
+                    # answer is for all clients
+                    my $sql_statement= "SELECT * FROM known_clients";
+                    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 $error = &send_msg_to_target($answer, $host_name, $host_key, $answer_header);
+                        &update_jobdb_status_for_send_msgs($answer, $error);
+                    }
                 }
-            }
-            elsif( $answer_target eq "GOSA" ) {
-                # answer is for GOSA and has to returned to connected client
-                my $gosa_answer = &encrypt_msg($answer, $GosaPackages_key);
-                $client_answer = $gosa_answer;
-            }
-            else {
-                # answer is for one specific host
-                # get encrypt_key
-                my $encrypt_key = &get_encrypt_key($answer_target);
-                if( !$encrypt_key ) {
-                    daemon_log("ERROR: no encrypt key found for answer target '$answer_target'", 1);
-                    next;
+
+                # targets of msg are all gosa-si-server in known_server_db
+                elsif( $answer_target eq "KNOWN_SERVER" ) {
+                    # answer is for all server in known_server
+                    my $sql_statement= "SELECT * FROM known_server";
+                    my $query_res = $known_server_db->select_dbentry( $sql_statement ); 
+                    while( my ($hit_num, $hit) = each %{ $query_res } ) {    
+                        my $host_name = $hit->{hostname};
+                        my $host_key = $hit->{hostkey};
+                        $answer =~ s/KNOWN_SERVER/$host_name/g;
+                        my $error = &send_msg_to_target($answer, $host_name, $host_key, $answer_header);
+                        &update_jobdb_status_for_send_msgs($answer, $error);
+                    }
+                }
+
+                # target of msg is GOsa
+                elsif( $answer_target eq "GOSA" ) {
+                    $answer =~ /<session_id>(\d+)<\/session_id>/;
+                    my $session_id = $1;
+                    my $add_on = "";
+                    if( defined $session_id ) {
+                        $add_on = ".session_id=$session_id";
+                    }
+                    # answer is for GOSA and has to returned to connected client
+                    my $gosa_answer = &encrypt_msg($answer, $GosaPackages_key);
+                    $client_answer = $gosa_answer.$add_on;
+                }
+
+                # target of msg is job queue at this host
+                elsif( $answer_target eq "JOBDB") {
+                    $answer =~ /<header>(\S+)<\/header>/;   
+                    my $header;
+                    if( defined $1 ) { $header = $1; }
+                    my $error = &send_msg_to_target($answer, $server_address, $GosaPackages_key, $header);
+                    &update_jobdb_status_for_send_msgs($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("INFO: target is mac address '$answer_target', looking for host in known_clients", 5);
+                    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;
+                    while( my ($hit_num, $hit) = each %{ $query_res } ) {    
+                        my $host_name = $hit->{hostname};
+                        my $host_key = $hit->{hostkey};
+                        $answer =~ s/$answer_target/$host_name/g;
+                        daemon_log("INFO: found host '$host_name', associated to '$answer_target'", 5);
+                        my $error = &send_msg_to_target($answer, $host_name, $host_key, $answer_header);
+                        &update_jobdb_status_for_send_msgs($answer, $error);
+                        $found_ip_flag++ ;
+                    }   
+                    if( $found_ip_flag == 0) {
+                        daemon_log("WARNING: no host found in known_clients with mac address '$answer_target'", 3);
+                        if( $bus_activ eq "true" ) { 
+                            daemon_log("INFO: try to forward msg '$answer_header' to bus '$bus_address'", 5);
+                            my $sql_statement = "SELECT * FROM known_server WHERE hostname='$bus_address'";
+                            my $query_res = $known_server_db->select_dbentry( $sql_statement );
+                            while( my ($hit_num, $hit) = each %{ $query_res } ) {    
+                                my $bus_address = $hit->{hostname};
+                                my $bus_key = $hit->{hostkey};
+                                my $error = &send_msg_to_target($answer, $bus_address, $bus_key, $answer_header);
+                                &update_jobdb_status_for_send_msgs($answer, $error);
+                                last;
+                            }
+                        }
+
+                    }
+
+                #  answer is for one specific host   
+                } else {
+                    # get encrypt_key
+                    my $encrypt_key = &get_encrypt_key($answer_target);
+                    if( not defined $encrypt_key ) {
+                        # unknown target, forward msg to bus
+                        daemon_log("WARNING: unknown target '$answer_target'", 3);
+                        if( $bus_activ eq "true" ) { 
+                            daemon_log("INFO: try to forward msg '$answer_header' to bus '$bus_address'", 5);
+                            my $sql_statement = "SELECT * FROM known_server WHERE hostname='$bus_address'";
+                            my $query_res = $known_server_db->select_dbentry( $sql_statement );
+                            my $res_length = keys( %{$query_res} );
+                            if( $res_length == 0 ){
+                                daemon_log("WARNING: send '$answer_header' to '$bus_address' failed, ".
+                                        "no bus found in known_server", 3);
+                            }
+                            else {
+                                while( my ($hit_num, $hit) = each %{ $query_res } ) {    
+                                    my $bus_key = $hit->{hostkey};
+                                    my $error = &send_msg_to_target($answer, $bus_address, $bus_key, $answer_header);
+                                    &update_jobdb_status_for_send_msgs($answer, $error);
+                                }
+                            }
+                        }
+                        next;
+                    }
+                    my $error = &send_msg_to_target($answer, $answer_target, $encrypt_key, $answer_header);
+                    &update_jobdb_status_for_send_msgs($answer, $error);
                 }
-                # send_msg
-                &send_msg_to_target($answer, $answer_target, $encrypt_key);
             }
         }
     }
 
     if( $client_answer ) {
+        if( $client_answer =~ s/session_id=(\d+)$// ) {
+            my $session_id = $1;
+            if( defined $session_id ) {
+                my $session_reference = $kernel->ID_id_to_session($session_id);
+                if( defined $session_reference ) {
+                    $heap = $session_reference->get_heap();
+                }
+            }     
+        }
         $heap->{client}->put($client_answer);
     }
 
@@ -787,80 +1364,753 @@ sub client_input {
 }
 
 
+
 sub trigger_db_loop {
-       my ($kernel) = $_[KERNEL];
-       $kernel->delay_set('watch_for_new_jobs',3);
+       my ($kernel) = @_ ;
+       $kernel->delay_set('watch_for_new_jobs', $job_queue_loop_delay);
+    $kernel->delay_set('watch_for_done_jobs', $job_queue_loop_delay); 
 }
 
+sub watch_for_done_jobs {
+    my ($kernel,$heap) = @_[KERNEL, HEAP];
+
+    my $sql_statement = "SELECT * FROM ".$job_queue_tn.
+        " WHERE status='done'";
+       my $res = $job_db->select_dbentry( $sql_statement );
+
+    while( my ($id, $hit) = each %{$res} ) {
+        my $jobdb_id = $hit->{id};
+        my $sql_statement = "DELETE FROM $job_queue_tn WHERE id='$jobdb_id'"; 
+        my $res = $job_db->del_dbentry($sql_statement);
+    }
+
+    $kernel->delay_set('watch_for_done_jobs',$job_queue_loop_delay);
+}
 
 sub watch_for_new_jobs {
        my ($kernel,$heap) = @_[KERNEL, HEAP];
 
        # check gosa job queue for jobs with executable timestamp
     my $timestamp = &get_time();
-
-    my $sql_statement = "SELECT * FROM ".$job_queue_table_name.
+    my $sql_statement = "SELECT * FROM ".$job_queue_tn.
         " WHERE status='waiting' AND timestamp<'$timestamp'";
-
        my $res = $job_db->select_dbentry( $sql_statement );
 
        while( my ($id, $hit) = each %{$res} ) {         
-
                my $jobdb_id = $hit->{id};
-               my $macaddress = $hit->{macaddress};
-               my $job_msg_hash = &transform_msg2hash($hit->{xmlmessage});
-               my $out_msg_hash = $job_msg_hash;
-        my $sql_statement = "SELECT * FROM known_clients WHERE macaddress='$macaddress'";
+               my $macaddress = $hit->{'macaddress'};
+        my $job_msg = $hit->{'xmlmessage'};
+        daemon_log("DEBUG: its time to execute $job_msg", 7); 
+        my $header = $hit->{'headertag'};
+        my $sql_statement = "SELECT * FROM known_clients WHERE macaddress LIKE '$macaddress'";
                my $res_hash = $known_clients_db->select_dbentry( $sql_statement );
                # expect macaddress is unique!!!!!!
                my $target = $res_hash->{1}->{hostname};
 
                if (not defined $target) {
-                       &daemon_log("ERROR: no host found for mac address: $job_msg_hash->{mac}[0]", 1);
-                       &daemon_log("xml message: $hit->{xmlmessage}", 5);
-            my $sql_statement = "UPDATE $job_queue_table_name ".
+                       &daemon_log("ERROR: no host found for mac address: $macaddress", 1);
+                       &daemon_log("$hit->{xmlmessage}", 8);
+            my $sql_statement = "UPDATE $job_queue_tn ".
                 "SET status='error', result='no host found for mac address' ".
                 "WHERE id='$jobdb_id'";
                        my $res = $job_db->update_dbentry($sql_statement);
                        next;
                }
 
-               # add target
-               &add_content2xml_hash($out_msg_hash, "target", $target);
-
-               # add new header
-               my $out_header = $job_msg_hash->{header}[0];
-               $out_header =~ s/job_/gosa_/;
-               delete $out_msg_hash->{header};
-               &add_content2xml_hash($out_msg_hash, "header", $out_header);
+               # change header
+        $job_msg =~ s/<header>job_/<header>gosa_/;
 
                # add sqlite_id 
-               &add_content2xml_hash($out_msg_hash, "jobdb_id", $jobdb_id); 
+        $job_msg =~ s/<\/xml>$/<jobdb_id>$jobdb_id<\/jobdb_id><\/xml>/;
 
-               my $out_msg = &create_xml_string($out_msg_hash);
+               my $func_error = &send_msg_to_target($job_msg, $server_address, $GosaPackages_key, $header);
 
-               # encrypt msg as a GosaPackage module
-               my $cipher = &create_ciphering($GosaPackages_key);
-               my $crypted_out_msg = &encrypt_msg($out_msg, $cipher);
+        # 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);
+    }
 
-               my $error = &send_msg_hash2address($out_msg_hash, "$gosa_ip:$gosa_port", $GosaPackages_key);
+       $kernel->delay_set('watch_for_new_jobs', $job_queue_loop_delay);
+}
 
-               if ($error == 0) {
-                       my $sql_statement = "UPDATE $job_queue_table_name ".
-                "SET status='processing', targettag='$target' ".
-                "WHERE id='$jobdb_id'";
-                       my $res = $job_db->update_dbentry($sql_statement);
-               } else {
-            my $sql_statement = "UPDATE $job_queue_table_name ".
-                "SET status='error' ".
-                "WHERE id='$jobdb_id'";
-                       my $res = $job_db->update_dbentry($sql_statement);
+
+sub refresh_ldap_handle {
+  my $mesg;
+
+  # Get an ldap handle, if we don't have one
+  if( ! defined $ldap_handle ){
+         $ldap_handle = Net::LDAP->new( $ldap_uri );
+  }
+  # Still not defined?
+  if( ! defined $ldap_handle ) {
+         daemon_log( "ch $$: Net::LDAP constructor failed: $!\n" );
+         return 0;
+  }
+
+  # Bind to ldap server - eventually authenticate
+  if( defined $ldap_admin_dn ) {
+    if( defined $ldap_admin_password ) {
+      $mesg = $ldap_handle->bind( $ldap_admin_dn, password => $ldap_admin_password );
+    } else {
+      $mesg = $ldap_handle->bind( $ldap_admin_dn );
+    }
+  } else {
+    $mesg = $ldap_handle->bind();
+  }
+
+  if( 0 != $mesg->code ) {
+    undef( $ldap_handle ) if( 81 == $mesg->code );
+    daemon_log( "ch $$: LDAP bind: error (". $mesg->code . ') - ' . $mesg->error . "\n", 1);
+    return 0;
+  }
+
+  return 1;
+}
+
+
+sub change_fai_state {
+    my ($st, $targets) = @_;
+
+    # Set FAI state to localboot
+    my %mapActions= (
+        reboot    => '',
+        update    => 'softupdate',
+        localboot => 'localboot',
+        reinstall => 'install',
+        rescan    => '',
+        wake      => '',
+        memcheck  => 'memcheck',
+        sysinfo   => 'sysinfo',
+    );
+
+    # Return if this is unknown
+    if (!exists $mapActions{ $st }){
+      return;
+    }
+
+    my $state= $mapActions{ $st };
+
+    &refresh_ldap_handle();
+    if( defined($ldap_handle) ) {
+
+      # Build search filter for hosts
+      my $search= "(&(objectClass=GOhard)";
+      foreach (@{$targets}){
+        $search.= "(macAddress=$_)";
+      }
+      $search.= ")";
+
+      # If there's any host inside of the search string, procress them
+      if (!($search =~ /macAddress/)){
+        return;
+      }
+
+      # Perform search for Unit Tag
+      my $mesg = $ldap_handle->search(
+          base   => $ldap_base,
+          scope  => 'sub',
+          attrs  => ['dn', 'FAIstate', 'objectClass'],
+          filter => "$search"
+          );
+
+      if ($mesg->count) {
+        my @entries = $mesg->entries;
+        foreach my $entry (@entries) {
+
+          # Only modify entry if it is not set to '$state'
+          if ($entry->get_value("FAIstate") ne "$state"){
+
+            daemon_log("INFO: Setting FAIstate to '$state' for ".$entry->dn, 5);
+            my $result;
+            my %tmp = map { $_ => 1 } $entry->get_value("objectClass");
+            if (exists $tmp{'FAIobject'}){
+              if ($state eq ''){
+                $result= $ldap_handle->modify($entry->dn, changes => [
+                            delete => [ FAIstate => [] ] ]);
+              } else {
+                $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 ] ]);
+            }
+
+            # Errors?
+            if ($result->code){
+              daemon_log("Error: Setting FAIstate to '$state' for ".$entry->dn. "failed: ".$result->error, 1);
+            }
+
+          }
+        }
+      }
+    }
+}
+
+
+sub change_goto_state {
+    my ($st, $targets) = @_;
+
+    # Switch on or off?
+    my $state= $st eq 'active' ? 'active': 'locked';
+
+    &refresh_ldap_handle();
+    if( defined($ldap_handle) ) {
+
+      # Build search filter for hosts
+      my $search= "(&(objectClass=GOhard)";
+      foreach (@{$targets}){
+        $search.= "(macAddress=$_)";
+      }
+      $search.= ")";
+
+      # If there's any host inside of the search string, procress them
+      if (!($search =~ /macAddress/)){
+        return;
+      }
+
+      # Perform search for Unit Tag
+      my $mesg = $ldap_handle->search(
+          base   => $ldap_base,
+          scope  => 'sub',
+          attrs  => ['dn', 'gotoMode'],
+          filter => "$search"
+          );
+
+      if ($mesg->count) {
+        my @entries = $mesg->entries;
+        foreach my $entry (@entries) {
+
+          # Only modify entry if it is not set to '$state'
+          if ($entry->get_value("gotoMode") ne $state){
+
+            daemon_log("INFO: Setting gotoMode to '$state' for ".$entry->dn, 5);
+            my $result;
+            $result= $ldap_handle->modify($entry->dn, changes => [
+                                                replace => [ gotoMode => $state ] ]);
+
+            # Errors?
+            if ($result->code){
+              &daemon_log("Error: Setting gotoMode to '$state' for ".$entry->dn. "failed: ".$result->error, 1);
+            }
+
+          }
+        }
+      }
+
+    }
+}
+
+
+sub create_fai_server_db {
+    my ($table_name) = @_;
+       my $result;
+
+       if(defined($ldap_handle)) {
+               daemon_log("INFO: create_fai_server_db: start", 5);
+               my $mesg= $ldap_handle->search(
+                       base   => $ldap_base,
+                       scope  => 'sub',
+                       attrs  => ['FAIrepository', 'gosaUnitTag'],
+                       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,
+                                                                  tag => (length($tmp_tag)>0)?$tmp_tag:"",
+                                                          } );
+                                          }
+                                  }
+                          }
+                  }
+               daemon_log("INFO: create_fai_server_db: finished", 5);
+       }       
+       return $result;
+}
+sub run_create_fai_server_db {
+    my ($session, $heap, $table_name) = @_[SESSION, HEAP, ARG0];
+    my $task = POE::Wheel::Run->new(
+            Program => sub { &create_fai_server_db($table_name) },
+            StdoutEvent  => "session_run_result",
+            StderrEvent  => "session_run_debug",
+            CloseEvent   => "session_run_done",
+            );
+
+    $heap->{task}->{ $task->ID } = $task;
+    return;
+}
+
+
+sub create_fai_release_db {
+       my ($table_name) = @_;
+       my $result;
+
+       if(defined($ldap_handle)) {
+               daemon_log("INFO: create_fai_release_db: start",5);
+               my $mesg= $ldap_handle->search(
+                       base   => $ldap_base,
+                       scope  => 'sub',
+                       attrs  => [],
+                       filter => "(&(objectClass=organizationalUnit)(ou=fai))",
+               );
+               if($mesg->{'resultCode'} == 0 &&
+                       $mesg->count != 0) {
+                       # Walk through all possible FAI container ou's
+                       my @sql_list;
+                       my $timestamp= &get_time();
+                       foreach my $ou (@{$mesg->{entries}}) {
+                               my $tmp_classes= resolve_fai_classes($ou->dn);
+                               if(defined($tmp_classes) && ref($tmp_classes) eq 'HASH') {
+                                       my @tmp_array=get_fai_release_entries($tmp_classes);
+                                       if(@tmp_array) {
+                                               foreach my $entry (@tmp_array) {
+                                                       if(defined($entry) && ref($entry) eq 'HASH') {
+                                                               my $sql= 
+                                                               "INSERT INTO $table_name "
+                                                               ."(timestamp, release, class, type, state) VALUES ("
+                                                               .$timestamp.","
+                                                               ."'".$entry->{'release'}."',"
+                                                               ."'".$entry->{'class'}."',"
+                                                               ."'".$entry->{'type'}."',"
+                                                               ."'".$entry->{'state'}."')";
+                                                               push @sql_list, $sql;
+                                                       }
+                                               }
+                                       }
+                               }
+                       }
+                       daemon_log("DEBUG: Inserting ".scalar @sql_list." entries to DB",6);
+                       if(@sql_list) {
+                               unshift @sql_list, "DELETE FROM $table_name";
+                               $fai_server_db->exec_statementlist(\@sql_list);
+                       }
+                       daemon_log("DEBUG: Done with inserting",6);
+               }
+               daemon_log("INFO: create_fai_release_db: finished",5);
+       }
+
+       return $result;
+}
+sub run_create_fai_release_db {
+    my ($session, $heap, $table_name) = @_[SESSION, HEAP, ARG0];
+    my $task = POE::Wheel::Run->new(
+            Program => sub { &create_fai_release_db($table_name) },
+            StdoutEvent  => "session_run_result",
+            StderrEvent  => "session_run_debug",
+            CloseEvent   => "session_run_done",
+            );
+
+    $heap->{task}->{ $task->ID } = $task;
+    return;
+}
+
+sub get_fai_types {
+       my $tmp_classes = shift || return undef;
+       my @result;
+
+       foreach my $type(keys %{$tmp_classes}) {
+               if(defined($tmp_classes->{$type}[0]) && (!($tmp_classes->{$type}[0] =~ /^.*?removed.*?$/))) {
+                       my $entry = {
+                               type => $type,
+                               state => $tmp_classes->{$type}[0],
+                       };
+                       push @result, $entry;
+               }
+       }
+
+       return @result;
+}
+
+sub get_fai_state {
+       my $result = "";
+       my $tmp_classes = shift || return $result;
+
+       foreach my $type(keys %{$tmp_classes}) {
+               if(defined($tmp_classes->{$type}[0])) {
+                       $result = $tmp_classes->{$type}[0];
+                       
+               # State is equal for all types in class
+                       last;
                }
        }
 
-       $kernel->delay_set('watch_for_new_jobs',3);
+       return $result;
 }
 
+sub resolve_fai_classes {
+       my $result;
+       my $fai_base= shift;
+       my @possible_fai_classes= ("FAIscript", "FAIhook", "FAIpartitionTable", "FAItemplate", "FAIvariable", "FAIprofile", "FAIpackageList");
+       my $fai_filter= "(|(&(objectClass=FAIclass)(|(objectClass=".join(")(objectClass=", @possible_fai_classes).")))(objectClass=FAIbranch))";
+       my $fai_classes;
+
+       daemon_log("DEBUG: Searching for FAI entries in base $fai_base",6);
+       my $mesg= $ldap_handle->search(
+               base   => $fai_base,
+               scope  => 'sub',
+               attrs  => ['cn','objectClass','FAIstate'],
+               filter => $fai_filter,
+       );
+       daemon_log("DEBUG: Found ".$mesg->count()." FAI entries",6);
+
+       if($mesg->{'resultCode'} == 0 &&
+               $mesg->count != 0) {
+               foreach my $entry (@{$mesg->{entries}}) {
+                       if($entry->exists('cn')) {
+                               my $tmp_dn= $entry->dn();
+
+                               # Skip classname and ou dn parts for class
+                               my $tmp_release = ($1) if $tmp_dn =~ /^[^,]+,[^,]+,(.*?),$fai_base$/;
+
+                               # Skip classes without releases
+                               if((!defined($tmp_release)) || length($tmp_release)==0) {
+                                       next;
+                               }
+
+                               my $tmp_cn= $entry->get_value('cn');
+                               my $tmp_state= $entry->get_value('FAIstate');
+
+                               my $tmp_type;
+                               # Get FAI type
+                               for my $oclass(@{$entry->get_value('objectClass', asref => 1)}) {
+                                       if(grep $_ eq $oclass, @possible_fai_classes) {
+                                               $tmp_type= $oclass;
+                                               last;
+                                       }
+                               }
+
+                               if($tmp_release =~ /^.*?,.*?$/ && (!($tmp_release =~ /^.*?\\,.*?$/))) {
+                                       # A Subrelease
+                                       my @sub_releases = split(/,/, $tmp_release);
+
+                                       # Walk through subreleases and build hash tree
+                                       my $hash;
+                                       while(my $tmp_sub_release = pop @sub_releases) {
+                                               $hash .= "\{'$tmp_sub_release'\}->";                                            
+                                       }
+                                       eval('push @{$fai_classes->'.$hash.'{$tmp_cn}->{$tmp_type}}, (defined($tmp_state) && length($tmp_state)>0)?$tmp_state:"";');
+                               } else {
+                                       # A branch, no subrelease
+                                       push @{$fai_classes->{$tmp_release}->{$tmp_cn}->{$tmp_type}}, (defined($tmp_state) && length($tmp_state)>0)?$tmp_state:"";
+                               }
+                       } elsif (!$entry->exists('cn')) {
+                               my $tmp_dn= $entry->dn();
+                               my $tmp_release = ($1) if $tmp_dn =~ /^(.*?),$fai_base$/;
+
+                               # Skip classes without releases
+                               if((!defined($tmp_release)) || length($tmp_release)==0) {
+                                       next;
+                               }
+
+                               if($tmp_release =~ /^.*?,.*?$/ && (!($tmp_release =~ /^.*?\\,.*?$/))) {
+                                       # A Subrelease
+                                       my @sub_releases= split(/,/, $tmp_release);
+
+                                       # Walk through subreleases and build hash tree
+                                       my $hash;
+                                       while(my $tmp_sub_release = pop @sub_releases) {
+                                               $hash .= "\{'$tmp_sub_release'\}->";                                            
+                                       }
+                                       # Remove the last two characters
+                                       chop($hash);
+                                       chop($hash);
+
+                                       eval('$fai_classes->'.$hash.'= {}');
+                               } else {
+                                       # A branch, no subrelease
+                                       if(!exists($fai_classes->{$tmp_release})) {
+                                               $fai_classes->{$tmp_release} = {};
+                                       }
+                               }
+                       }
+               }
+
+               # The hash is complete, now we can honor the copy-on-write based missing entries
+               foreach my $release (keys %$fai_classes) {
+                       $result->{$release}= deep_copy(apply_fai_inheritance($fai_classes->{$release}));
+               }
+       }
+       return $result;
+}
+
+sub apply_fai_inheritance {
+       my $fai_classes = shift || return {};
+       my $tmp_classes;
+
+       # Get the classes from the branch
+       foreach my $class (keys %{$fai_classes}) {
+               # Skip subreleases
+               if($class =~ /^ou=.*$/) {
+                       next;
+               } else {
+                       $tmp_classes->{$class}= deep_copy($fai_classes->{$class});
+               }
+       }
+
+       # Apply to each subrelease
+       foreach my $subrelease (keys %{$fai_classes}) {
+               if($subrelease =~ /ou=/) {
+                       foreach my $tmp_class (keys %{$tmp_classes}) {
+                               if(!exists($fai_classes->{$subrelease}->{$tmp_class})) {
+                                       $fai_classes->{$subrelease}->{$tmp_class} =
+                                       deep_copy($tmp_classes->{$tmp_class});
+                               } else {
+                                       foreach my $type (keys %{$tmp_classes->{$tmp_class}}) {
+                                               if(!exists($fai_classes->{$subrelease}->{$tmp_class}->{$type})) {
+                                                       $fai_classes->{$subrelease}->{$tmp_class}->{$type}=
+                                                       deep_copy($tmp_classes->{$tmp_class}->{$type});
+                                               }
+                                       }
+                               }
+                       }
+               }
+       }
+
+       # Find subreleases in deeper levels
+       foreach my $subrelease (keys %{$fai_classes}) {
+               if($subrelease =~ /ou=/) {
+                       foreach my $subsubrelease (keys %{$fai_classes->{$subrelease}}) {
+                               if($subsubrelease =~ /ou=/) {
+                                       apply_fai_inheritance($fai_classes->{$subrelease});
+                               }
+                       }
+               }
+       }
+
+       return $fai_classes;
+}
+
+sub get_fai_release_entries {
+       my $tmp_classes = shift || return;
+       my $parent = shift || "";
+       my @result = shift || ();
+
+       foreach my $entry (keys %{$tmp_classes}) {
+               if(defined($entry)) {
+                       if($entry =~ /^ou=.*$/) {
+                               my $release_name = $entry;
+                               $release_name =~ s/ou=//g;
+                               if(length($parent)>0) {
+                                       $release_name = $parent."/".$release_name;
+                               }
+                               my @bufentries = get_fai_release_entries($tmp_classes->{$entry}, $release_name, @result);
+                               foreach my $bufentry(@bufentries) {
+                                       push @result, $bufentry;
+                               }
+                       } else {
+                               my @types = get_fai_types($tmp_classes->{$entry});
+                               foreach my $type (@types) {
+                                       push @result, 
+                                       {
+                                               'class' => $entry,
+                                               'type' => $type->{'type'},
+                                               'release' => $parent,
+                                               'state' => $type->{'state'},
+                                       };
+                               }
+                       }
+               }
+       }
+
+       return @result;
+}
+
+sub deep_copy {
+       my $this = shift;
+       if (not ref $this) {
+               $this;
+       } elsif (ref $this eq "ARRAY") {
+               [map deep_copy($_), @$this];
+       } elsif (ref $this eq "HASH") {
+               +{map { $_ => deep_copy($this->{$_}) } keys %$this};
+       } else { die "what type is $_?" }
+}
+
+
+sub session_run_result {
+    my ($kernel, $heap, $client_answer) = @_[KERNEL, HEAP, ARG0];    
+    $kernel->sig(CHLD => "child_reap");
+}
+
+sub session_run_debug {
+    my $result = $_[ARG0];
+    print STDERR "$result\n";
+}
+
+sub session_run_done {
+    my ( $kernel, $heap, $task_id ) = @_[ KERNEL, HEAP, ARG0 ];
+    delete $heap->{task}->{$task_id};
+}
+
+
+sub create_packages_list_db {
+    my ($sources_file) = @_ ;
+    my $line;
+    daemon_log("INFO: create_packages_list_db: start", 5); 
+
+    open(CONFIG, "<$sources_file") or do {
+        daemon_log( "ERROR: create_packages_list_db: Failed to open '$sources_file'", 1);
+        return;
+    };
+    
+    # Read lines
+    while ($line = <CONFIG>){
+        # Unify
+        chop($line);
+        $line =~ s/^\s+//;
+        $line =~ s/^\s+/ /;
+
+        # Strip comments
+        $line =~ s/#.*$//g;
+
+        # Skip empty lines
+        if ($line =~ /^\s*$/){
+            next;
+        }
+
+        # Interpret deb line
+        if ($line =~ /^deb [^\s]+\s[^\s]+\s[^\s]+/){
+            my( $baseurl, $dist, $sections ) = ($line =~ /^deb\s([^\s]+)\s+([^\s]+)\s+(.*)$/);
+            my $section;
+            foreach $section (split(' ', $sections)){
+                &parse_package_info( $baseurl, $dist, $section );
+            }
+        }
+    }
+
+    close (CONFIG);
+
+    daemon_log("INFO: create_packages_list_db: finished", 5); 
+    return;
+}
+sub run_create_packages_list_db {
+    my ($session, $heap, $sources_list) = @_[SESSION, HEAP, ARG0];
+    my $task = POE::Wheel::Run->new(
+            Program => sub { &create_packages_list_db($sources_list) },
+            StdoutEvent  => "session_run_result",
+            StderrEvent  => "session_run_debug",
+            CloseEvent   => "session_run_done",
+            );
+
+    $heap->{task}->{ $task->ID } = $task;
+}
+sub parse_package_info {
+  my ($baseurl, $dist, $section)= @_;
+  my ($package);
+
+  my ($path) = ($baseurl =~ m%://[^/]*(.*)$%);
+
+  foreach $package ("Packages.gz"){
+    daemon_log("DEBUG: create_packages_list: fetch $baseurl, $dist, $section", 7);
+    get_package( "$baseurl/dists/$dist/$section/binary-$arch/$package", "$outdir/$dist/$section" );
+    parse_package( "$outdir/$dist/$section", $dist, $path );
+  }
+}
+sub get_package {
+  my ($url, $dest)= @_;
+
+  my $tpath = dirname($dest);
+  -d "$tpath" || mkpath "$tpath";
+
+  # This is ugly, but I've no time to take a look at "how it works in perl"
+  if(0 == system("wget '$url' -O '$dest' 2>/dev/null") ) {
+      system("gunzip -cd '$dest' > '$dest.in'");
+      system("rm -f '$dest'");
+  } else {
+      daemon_log("ERROR: create_packages_list_db: get_packages: fetching '$url' failed!", 1);
+  }
+  return 0;
+}
+sub parse_package {
+    my ($path, $dist, $srv_path )= @_;
+    my ($package, $version, $section, $description);
+    my @sql_list;
+    my $PACKAGES;
+
+    if(not stat("$path.in")) {
+        daemon_log("ERROR: create_packages_list: parse_package: file '$path.in' is not readable",1);
+        return;
+    }
+
+    open($PACKAGES, "<$path.in");
+       if(not defined($PACKAGES)) {
+        daemon_log("ERROR: create_packages_list_db: parse_package: can not open '$path.in'",1); 
+        return;
+    }
+
+    # Read lines
+    while (<$PACKAGES>){
+        my $line = $_;
+        # Unify
+        chop($line);
+
+        # Use empty lines as a trigger
+        if ($line =~ /^\s*$/){
+            my $sql = "INSERT INTO packages_list VALUES ('$dist', '$package', '$version', '$section', 'xxx', 'none', '0')";
+            push(@sql_list, $sql);
+            $package = "none";
+            $version = "none";
+            $section = "none";
+            $description = "none"; 
+            next;
+        }
+
+        # Trigger for package name
+        if ($line =~ /^Package:\s/){
+            ($package)= ($line =~ /^Package: (.*)$/);
+            next;
+        }
+
+        # Trigger for version
+        if ($line =~ /^Version:\s/){
+            ($version)= ($line =~ /^Version: (.*)$/);
+            next;
+        }
+
+        # Trigger for description
+        if ($line =~ /^Description:\s/){
+            ($description)= ($line =~ /^Description: (.*)$/);
+            next;
+        }
+
+        # Trigger for section
+        if ($line =~ /^Section:\s/){
+            ($section)= ($line =~ /^Section: (.*)$/);
+            next;
+        }
+
+    }
+
+    close( $PACKAGES );
+    unlink( "$path.in" );
+    
+    $packages_list_db->exec_statementlist(\@sql_list);
+}
+
+#
+#sub store_fileinfo {
+#  my( $package, $file, $dist, $path, $vers ) = @_;
+#
+#  my %fileinfo = (
+#    'package' => $package,
+#    'dist' => $dist,
+#    'version' => $vers
+#  );
+#
+#  $repo_files{ "${srvdir}${path}/$file" } = \%fileinfo;
+#}
+
 
 #==== MAIN = main ==============================================================
 #  parse commandline options
@@ -882,8 +2132,9 @@ $SIG{CHLD} = 'IGNORE';
 
 # forward error messages to logfile
 if( ! $foreground ) {
-    open(STDERR, '>>', $log_file);
-    open(STDOUT, '>>', $log_file);
+  open( STDIN,  '+>/dev/null' );
+  open( STDOUT, '+>&STDIN'    );
+  open( STDERR, '+>&STDIN'    );
 }
 
 # Just fork, if we are not in foreground mode
@@ -909,46 +2160,90 @@ if( 0 != $pid ) {
 daemon_log(" ", 1);
 daemon_log("$0 started!", 1);
 
+if ($no_bus > 0) {
+    $bus_activ = "false"
+}
+
+
+
 # delete old DBsqlite lock files
-system('rm -f /tmp/gosa_si_lock*');
+#unlink('/tmp/gosa_si_lock*');
 
 # connect to gosa-si job queue
-my @job_col_names = ("id", "timestamp", "status", "result", "headertag", "targettag", "xmlmessage", "macaddress");
 $job_db = GOSA::DBsqlite->new($job_queue_file_name);
-$job_db->create_table('jobs', \@job_col_names);
+$job_db->create_table($job_queue_tn, \@job_queue_col_names);
 
 # connect to known_clients_db
-my @clients_col_names = ('hostname', 'status', 'hostkey', 'timestamp', 'macaddress', 'events');
 $known_clients_db = GOSA::DBsqlite->new($known_clients_file_name);
-$known_clients_db->create_table('known_clients', \@clients_col_names);
+$known_clients_db->create_table($known_clients_tn, \@known_clients_col_names);
 
 # connect to known_server_db
-my @server_col_names = ('hostname', 'status', 'hostkey', 'timestamp');
 $known_server_db = GOSA::DBsqlite->new($known_server_file_name);
-$known_server_db->create_table('known_server', \@server_col_names);
+$known_server_db->create_table($known_server_tn, \@known_server_col_names);
 
-# import all modules
-&import_modules;
+# connect to login_usr_db
+$login_users_db = GOSA::DBsqlite->new($login_users_file_name);
+$login_users_db->create_table($login_users_tn, \@login_users_col_names);
+
+# connect to fai_server_db and fai_release_db
+$fai_server_db = GOSA::DBsqlite->new($fai_server_file_name);
+$fai_server_db->create_table($fai_server_tn, \@fai_server_col_names);
+$fai_server_db->create_table($fai_release_tn, \@fai_release_col_names);
+
+# connect to packages_list_db
+unlink($packages_list_file_name);
+$packages_list_db = GOSA::DBsqlite->new($packages_list_file_name);
+$packages_list_db->create_table($packages_list_tn, \@packages_list_col_names);
+
+# connect to messaging_db
+$messaging_db = GOSA::DBsqlite->new($messaging_file_name);
+$messaging_db->create_table($messaging_tn, \@messaging_col_names);
 
-# check wether all modules are gosa-si valid passwd check
 
 # create xml object used for en/decrypting
 $xml = new XML::Simple();
 
+# create socket for incoming xml messages
+
+POE::Component::Server::TCP->new(
+       Port => $server_port,
+       ClientInput => sub {
+        my ($kernel, $input) = @_[KERNEL, ARG0];
+        push(@tasks, $input);
+        $kernel->yield("next_task");
+        },
+    InlineStates => {
+        next_task => \&next_tasks,
+        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);
+
 # create session for repeatedly checking the job queue for jobs
 POE::Session->create(
        inline_states => {
-               _start => \&trigger_db_loop,
+               _start => \&_start,
                watch_for_new_jobs => \&watch_for_new_jobs,
+        watch_for_done_jobs => \&watch_for_done_jobs,
+        create_packages_list_db => \&run_create_packages_list_db,
+        create_fai_server_db => \&run_create_fai_server_db,
+        create_fai_release_db => \&run_create_fai_release_db,
+        session_run_result => \&session_run_result,
+        session_run_debug => \&session_run_debug,
+        session_run_done => \&session_run_done,
+        child_reap => sub { "Do nothing special. I'm just a comment, but i'm necessary!"  },
        }
 );
 
-# create socket for incoming xml messages
-POE::Component::Server::TCP->new(
-       Port => $server_port,
-       ClientInput => \&client_input,
-);
-daemon_log("start socket for incoming xml messages at port '$server_port' ", 1);
+
+# import all modules
+&import_modules;
+
+# check wether all modules are gosa-si valid passwd check
 
 POE::Kernel->run();
 exit;