diff --git a/gosa-si/gosa-si-client b/gosa-si/gosa-si-client
index 44ddd467c5370a100011c74709fb4c18c8bc164c..7f721da2f1a6675ce2fded8e859549b6b3a91bfe 100755 (executable)
--- a/gosa-si/gosa-si-client
+++ b/gosa-si/gosa-si-client
use POE qw(Component::Server::TCP Wheel::FollowTail Wheel::Run);
use IO::Socket::INET;
use NetAddr::IP;
-use Data::Dumper;
use Crypt::Rijndael;
use GOSA::GosaSupportDaemon;
use Digest::MD5 qw(md5_hex md5 md5_base64);
our $REGISTERED = 0;
# path to fifo for non-gosa-si-client messages to gosa-si-server
-my $fai_com_fifo = "/var/run/gosa-si-client-fai-com.socket";
+my $fai_com_fifo = "/var/run/gosa-si-client.socket";
my $system_com_fifo = "/var/run/gosa-si-client-system-com.socket";
my %files_to_watch = (fai_fifo => $fai_com_fifo, system_fifo => $system_com_fifo);
# Select all files under /tmp with prefix 'goto_notify'
my $goto_dir = "/tmp";
opendir(DIR, $goto_dir);
- my @goto_files = grep { /^goto_notify_/ && -f "$goto_dir/$_" } readdir(DIR);
+ my @goto_files = grep { /.+\.goto_notify$/ && -f "$goto_dir/$_" } readdir(DIR);
closedir DIR;
# Check if file has 'seen' tag
# if client is alread in a registration process, that means not registered, do nothing
# if not, cause re-registration
+# TODO : This if-else can cause a registration deadlock. Currently I can not reproduce the deadlock and don't have a clue what is the reason for the deadlock
if (not $REGISTERED) {
&daemon_log("WARNING: gosa-si-client is already in a registration process so ignore this message", 3);
} else {
$xml = new XML::Simple();
$default_server_key = $server_key;
-
# add gosa-si-server address from config file at first position of server list
my $server_check_cfg = Config::IniFiles->new( -file => $cfg_file );
my $server_check = (defined($server_check_cfg))?$server_check_cfg->val( "server", "ip"):undef;