upgrade of DBsqlite to more powerfull functions

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

diff --git a/gosa-si/modules/ServerPackages.pm b/gosa-si/modules/ServerPackages.pm
index 95baac87a96e80b43e082d425ce4d92e42c3c7f1..80ce0ada7ea9b34d085b9bdf44aece6257816bdd 100644 (file)
--- a/gosa-si/modules/ServerPackages.pm
+++ b/gosa-si/modules/ServerPackages.pm
@@ -58,9 +58,6 @@ my %cfg_defaults =
 $network_interface= &get_interface_for_ip($server_ip);
 $server_mac_address= &get_mac($network_interface); 
 
-&main::daemon_log("server ip address detected: $server_ip", 1);
-&main::daemon_log("server mac address detected: $server_mac_address", 1);
-
 # complete addresses
 my $server_address = "$server_ip:$server_port";
 my $bus_address = "$bus_ip:$bus_port";
@@ -68,31 +65,13 @@ my $bus_address = "$bus_ip:$bus_port";
 # create general settings for this module
 my $xml = new XML::Simple();
 
-## open server socket
-#if($server_activ eq "on"){
-#    &main::daemon_log(" ", 1);
-#    $server = IO::Socket::INET->new(LocalPort => $server_port,
-#            Type => SOCK_STREAM,
-#            Reuse => 1,
-#            Listen => 20,
-#            ); 
-#    if(not defined $server){
-#        &main::daemon_log("cannot be a tcp server at $server_port : $@");
-#        die;
-#    } else {
-#        &main::daemon_log("start server: $server_address", 1);
-#    }
-#}
-#
-#
-## register at bus
-#if ($main::no_bus > 0) {
-#    $bus_activ = "off"
-#}
-#if($bus_activ eq "on") {
-#    &main::daemon_log(" ", 1);
-#    &register_at_bus();
-#}
+# register at bus
+if ($main::no_bus > 0) {
+    $bus_activ = "off"
+}
+if($bus_activ eq "on") {
+    &register_at_bus();
+}
 
 ### functions #################################################################
 
@@ -379,7 +358,9 @@ sub process_incoming_msg {
 
     # check wether incoming msg is from a known_server
     if( not defined $msg ) {
-        my $query_res = $main::known_server_db->select_dbentry( {table=>'known_server'} ); 
+        #my $query_res = $main::known_server_db->select_dbentry( {table=>'known_server'} ); 
+        my $sql_statement= "SELECT * FROM known_server";
+        my $query_res = $main::known_server_db->select_dbentry( $sql_statement ); 
         while( my ($hit_num, $hit) = each %{ $query_res } ) {  
             $host_name = $hit->{hostname};
             if( not $host_name =~ "^$host") {
@@ -408,7 +389,9 @@ sub process_incoming_msg {
 
     # check wether incoming msg is from a known_client
     if( not defined $msg ) {
-        my $query_res = $main::known_clients_db->select_dbentry( {table=>'known_clients'} ); 
+        #my $query_res = $main::known_clients_db->select_dbentry( {table=>'known_clients'} ); 
+        my $sql_statement= "SELECT * FROM known_clients";
+        my $query_res = $main::known_clients_db->select_dbentry( $sql_statement ); 
         while( my ($hit_num, $hit) = each %{ $query_res } ) {    
             $host_name = $hit->{hostname};
             if( not $host_name =~ "^$host") {
@@ -437,7 +420,7 @@ sub process_incoming_msg {
 
     if( not defined $msg ) {
         &main::daemon_log("WARNING: ServerPackage do not understand the message:", 5);
-        &main::daemon_log("$@", 7);
+        &main::daemon_log("$@", 8);
         return;
     }