From e3cdb8a69ba653d91537d78929007c2b6fea9e58 Mon Sep 17 00:00:00 2001 From: rettenbe Date: Tue, 3 Jun 2008 10:12:08 +0000 Subject: [PATCH] bugfix: gosa-si-server: if incoming target_address is an ip address, detect ip address of server corresponding to the target git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@11167 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-si/gosa-si-server | 2 +- gosa-si/server/events/clMessages.pm | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gosa-si/gosa-si-server b/gosa-si/gosa-si-server index 7a9ca4756..7a652eb60 100755 --- a/gosa-si/gosa-si-server +++ b/gosa-si/gosa-si-server @@ -1069,7 +1069,7 @@ sub msg_to_decrypt { $target = @{$msg_hash->{'target'}}[0]; $source = @{$msg_hash->{'source'}}[0]; my ($target_ip, $target_port) = split(':', $target); - if ($target ne "GOSA") { + if ($target =~ /^\d+\.\d+\.\d+\.\d+:\d+$/) { my $server_address = &get_local_ip_for_remote_ip($target_ip).":$server_port"; } diff --git a/gosa-si/server/events/clMessages.pm b/gosa-si/server/events/clMessages.pm index 7425bfbac..fc2ab4aab 100644 --- a/gosa-si/server/events/clMessages.pm +++ b/gosa-si/server/events/clMessages.pm @@ -342,6 +342,11 @@ sub TASKBEGIN { # set fai_state to localboot &main::change_fai_state('localboot', \@{$msg_hash->{'macaddress'}}, $session_id); + # TASKBEGIN eq chboot + } elsif ($content eq 'chboot') { + # just ignor this client message + # do nothing + # other TASKBEGIN msgs } else { # select processing jobs for host -- 2.30.2