Fixed server event handling

[gosa.git] / gosa-si / gosa-si-client

diff --git a/gosa-si/gosa-si-client b/gosa-si/gosa-si-client
index 237470160e53564ffc52ed8a4a9d0795c84815ae..abda025bdbc8b80370cec7278cb3dd8e4929500e 100755 (executable)
--- a/gosa-si/gosa-si-client
+++ b/gosa-si/gosa-si-client
@@ -41,7 +41,7 @@ use File::Basename;
 my $event_dir = "/usr/lib/gosa-si/client/events";
 use lib "/usr/lib/gosa-si/client/events";
 
-my ($cfg_file, %cfg_defaults, $foreground, $verbose, $pid_file, $opts_file, $procid, $pid, $log_file, $fai_logpath);
+my (%cfg_defaults, $foreground, $verbose, $pid_file, $procid, $pid, $log_file, $fai_logpath);
 my ($server_ip, $server_port, $server_key, $server_timeout, $server_domain, $server_key_lifetime);
 my ($client_ip, $client_port, $client_mac_address, $ldap_enabled, $ldap_config, $pam_config, $nss_config);
 my $xml;
@@ -55,8 +55,13 @@ $verbose= 1;
 
 # globalise variables which are used in imported events
 our $cfg_file;
+our $opts_file;
 our $server_address;
 our $client_address;
+our $client_ip;
+our $client_mac_address;
+our $client_dnsname;
+our $client_force_hostname;
 our $server_key;
 
 # default variables
@@ -87,6 +92,7 @@ our $prg= basename($0);
      "pam-config"         => [\$pam_config, "/etc/pam_ldap.conf"],
      "nss-config"         => [\$nss_config, "/etc/libnss_ldap.conf"],
      "fai-logpath"         => [\$fai_logpath, "/var/log/fai/fai.log"],
+        "force-hostname"               => [\$client_force_hostname, "false"],
     },
 "server" => {
     "ip"          => [\$server_ip, "127.0.0.1"],
@@ -717,6 +723,17 @@ sub register_at_gosa_si_server {
       &add_content2xml_hash($register_hash, "events", $events);
       &add_content2xml_hash($register_hash, "gotoHardwareChecksum", $gotoHardwareChecksum);
 
+         # Add $HOSTNAME from ENV if force-hostname is set
+         if( defined($client_force_hostname) && 
+                 $client_force_hostname eq "true") {
+                 if(defined($ENV{HOSTNAME}) &&
+                         length($ENV{HOSTNAME}) >0 ) {
+                         &add_content2xml_hash($register_hash, "force-hostname", $ENV{HOSTNAME});
+                 } else {
+                         &main::daemon_log("force-hostname was set to true, but no \$HOSTNAME was found in Environment!",0);
+                 }
+         }
+
       # send xml hash to server with general server passwd
       my $res = &send_msg_hash_to_target($register_hash, $server, $default_server_key);
       if($res == 0) {
@@ -727,21 +744,8 @@ sub register_at_gosa_si_server {
         $client_ip= &get_local_ip_for_remote_ip(sprintf("%s", $server =~ /^([0-9\.]*?):.*$/));
         $client_address= "$client_ip:$client_port";
         $client_mac_address = $local_mac;
+               $client_dnsname = $dnsname;
 
-        # Write the MAC address to file
-        if(stat($opts_file)) {
-          unlink($opts_file);
-        }
-
-        my $opts_file_FH;
-        my $hostname= $dnsname;
-        $hostname =~ s/\..*$//;
-        open($opts_file_FH, ">$opts_file");
-        print $opts_file_FH "MAC=\"$local_mac\"\n";
-        print $opts_file_FH "IPADDRESS=\"$client_ip\"\n";
-        print $opts_file_FH "HOSTNAME=\"$hostname\"\n";
-        print $opts_file_FH "FQDN=\"$dnsname\"\n";
-        close($opts_file_FH);
         last;
       } else {
         $try_to_register++;