From: cajus Date: Tue, 12 Feb 2008 09:40:59 +0000 (+0000) Subject: Fixed regex, fixed DB paths X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=0318abed0090d29c05758b5ae28382f81ce4f3ed;p=gosa.git 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 a46f68c2e..c279b4334 100755 --- 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 a6b1bd953..b36c412e4 100755 --- 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$/;