Fixed regex, fixed DB paths

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@8850 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-si/gosa-si-server b/gosa-si/gosa-si-server
index a46f68c2e7897aa48e57e2d903f3dcad5bd07949..c279b433456abc0f1c64f36570538015393ea0f0 100755 (executable)
--- a/gosa-si/gosa-si-server
+++ b/gosa-si/gosa-si-server
@@ -917,7 +917,7 @@ sub client_input {
                         &send_msg_to_target($answer, $host_name, $host_key, $answer_header);
                     }
                 }
-                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})/ ) {
+                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("target is mac address '$answer_target', looking for host in known_clients", 3);
                     my $sql_statement = "SELECT * FROM known_clients WHERE macaddress='$answer_target'";
                     my $query_res = $known_clients_db->select_dbentry( $sql_statement );

diff --git a/gosa-si/tests/sqlite-check.pl b/gosa-si/tests/sqlite-check.pl
index a6b1bd953a606812a209169d3c4c4ee711593b1b..b36c412e471b43f7ffbd4792ac1b979ddf7dc913 100755 (executable)
--- a/gosa-si/tests/sqlite-check.pl
+++ b/gosa-si/tests/sqlite-check.pl
@@ -28,7 +28,7 @@ my $res;
 my $db_name;
 
     
-$db_name = "/var/lib/gosa-si/gosa-si-server_jobs.db";
+$db_name = "/var/lib/gosa-si/jobs.db";
 if (-e $db_name) {
     print "\n############################################################\n";
     my $table_name = "jobs";
@@ -42,7 +42,7 @@ if (-e $db_name) {
 }
 
 
-$db_name = "/var/lib/gosa-si/gosa-si-server_known_clients.db";
+$db_name = "/var/lib/gosa-si/clients.db";
 if (-e $db_name) {
     print "\n############################################################\n";
 #    $db_name =~ /\/([^\/]*?)\.db$/;
@@ -59,7 +59,7 @@ if (-e $db_name) {
 }
 
 
-$db_name = "/var/lib/gosa-si/gosa-si-server_known_server.db";
+$db_name = "/var/lib/gosa-si/server.db";
 if (-e $db_name) {
     print "\n############################################################\n";
 #    $db_name =~ /\/([^\/]*?)\.db$/;
@@ -76,7 +76,7 @@ if (-e $db_name) {
 }
 
 
-$db_name = "/var/lib/gosa-si/gosa-si-bus_known_server.db";
+$db_name = "/var/lib/gosa-si/bus-server.db";
 if (-e $db_name) {
     print "\n############################################################\n";
 #    $db_name =~ /\/([^\/]*?)\.db$/;
@@ -91,7 +91,7 @@ if (-e $db_name) {
     print $answer."\n";
 }
 
-$db_name = "/var/lib/gosa-si/gosa-si-bus_known_clients.db";
+$db_name = "/var/lib/gosa-si/bus-clients.db";
 if (-e $db_name) {
     print "\n############################################################\n";
 #    $db_name =~ /\/([^\/]*?)\.db$/;