Changed permissions for /etc/ldap/ldap-shell.conf from 0600 to 0644.

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

diff --git a/gosa-si/gosa-si-client b/gosa-si/gosa-si-client
index b7a20565a63d6828876e6fa0c1bb2720d29930f3..cf352ac42c86df9398af9bbd960aa18c2cfed2e2 100755 (executable)
--- a/gosa-si/gosa-si-client
+++ b/gosa-si/gosa-si-client
@@ -18,6 +18,8 @@
 #     REVISION:  ---
 #===============================================================================
 
+my $client_version = '$HeadURL$:$Rev$';
+
 use strict;
 use warnings;
 use Getopt::Long;
@@ -36,11 +38,11 @@ use MIME::Base64;
 use XML::Simple;
 use File::Basename;
 use File::Spec;
+use Fcntl;
 
 # Workaround: need pure perl to make it work with UTF-8 :-(
 $XML::Simple::PREFERRED_PARSER= "XML::SAX::PurePerl";
 
-my $client_version = '$HeadURL$:$Rev$';
 my $client_headURL;
 my $client_revision;
 my $client_status;
@@ -50,6 +52,7 @@ use lib "/usr/lib/gosa-si/client/events";
 my (%cfg_defaults, $foreground, $verbose, $pid_file, $procid, $pid, $log_file, $fai_logpath);
 my ($server_ip, $server_port, $server_timeout, $server_domain, $server_key_lifetime);
 my ($client_port, $ldap_enabled, $ldap_config, $pam_config, $nss_config);
+my ($root_uid, $adm_gid);
 my $xml;
 my $event_hash;
 my $default_server_key;
@@ -233,11 +236,17 @@ sub daemon_log {
     if(not defined $msg) { return }
     if(not defined $level) { $level = 1 }
     if(defined $log_file){
-        open(LOG_HANDLE, ">>$log_file");
-        if(not defined open( LOG_HANDLE, ">>$log_file" )) {
-            print STDERR "cannot open $log_file: $!";
-            return 
-        }
+               my $open_log_fh = sysopen(LOG_HANDLE, $log_file, O_WRONLY | O_CREAT | O_APPEND , 0440); 
+               if(not $open_log_fh) {
+                       print STDERR "cannot open $log_file: $!";
+                       return;
+               }       
+               # check owner and group of log_file and update settings if necessary       
+               my ($dev, $ino, $mode, $nlink, $uid, $gid, $rdev, $size, $atime, $mtime, $ctime, $blksize, $blocks) = stat($log_file);
+               if((not $uid eq $root_uid) || (not $gid eq $adm_gid)) {
+                       chown($root_uid, $adm_gid, $log_file);
+               }
+
         chomp($msg);
         if($level <= $verbose){
             my ($seconds, $minutes, $hours, $monthday, $month,
@@ -893,11 +902,16 @@ sub save_fai_log {
     my ($fai_log_dir) = @_ ;
     my $FAI_DIR;
 
+       # Directory for log files after a softupdate
     my $log_dir = File::Spec->catdir($fai_log_dir, "localhost/last");
 
-    if (not -r -d $log_dir) { 
-        daemon_log("ERROR: cannot open directory $log_dir", 1);
-        return; 
+    if (not -d $log_dir) { 
+               # Directory for log files after a new installation
+               $log_dir = "/tmp/fai";
+               if (not -d $log_dir) {
+                               daemon_log("ERROR: cannot open directory $log_dir", 1);
+                               return; 
+               }
     }
 
     opendir($FAI_DIR, "$log_dir");
@@ -911,19 +925,17 @@ sub save_fai_log {
         my $log = "log_file:$log_file:";
         $log_file = File::Spec->catfile( $log_dir, $log_file );
 
-        if (not -r -f $log_file) {
+        if (not -f $log_file) {
             daemon_log("ERROR: cannot read $log_file", 1);
             next;
         }
 
-        if (-r -f $log_file) {
-            open(FILE, "<$log_file");
-            my @lines = <FILE> ;
-            close (FILE);
-            my $log_string = join("", @lines); 
-            $log .= &encode_base64($log_string);
-            push(@log_list, $log); 
-        }
+        open(FILE, "<$log_file");
+        my @lines = <FILE> ;
+        close (FILE);
+        my $log_string = join("", @lines); 
+        $log .= &encode_base64($log_string);
+        push(@log_list, $log); 
     }
 
     my $all_log_string = join("\n", @log_list); 
@@ -1117,12 +1129,12 @@ if ($client_headURL =~ /\/tag\// ||
     $client_status = "developmental" ;
 }
 
-# Prepare log file
-my $root_uid = getpwnam('root');
-my $adm_gid = getgrnam('adm');
-chmod(0640, $log_file);
-chown($root_uid, $adm_gid, $log_file);
-
+# Determine root uid and adm gid, used for creating log files
+$root_uid = getpwnam('root');
+$adm_gid = getgrnam('adm');
+if(not defined $adm_gid){
+       $adm_gid = getgrnam('root');
+}
 
 daemon_log(" ", 1);
 daemon_log("$prg started!", 1);
@@ -1191,12 +1203,12 @@ if( defined $server_check ) {
        my @tmp_servers;
        if ( !$server_domain) {
                # Try our DNS Searchlist
-        my @domain_list = &get_dns_domains();
-        my $tmp_domains;
-        my $error_string;
+               my @domain_list = &get_dns_domains();
+               my $tmp_domains;
+               my $error_string;
                for my $domain (@domain_list) {
                        chomp($domain);
-            ($tmp_domains, $error_string) = &get_server_addresses($domain);
+                       ($tmp_domains, $error_string) = &get_server_addresses($domain);
                        if(@$tmp_domains) {
                                for my $tmp_server(@$tmp_domains) {
                                        push @tmp_servers, $tmp_server;
@@ -1204,11 +1216,11 @@ if( defined $server_check ) {
                        }
                }
                if (0 == @tmp_servers) {
-            my $log_string = "no gosa-si-server found!";
-            $log_string .= "\n\tdetermined domains out of /etc/resolv.conf: ".join(", ", @domain_list); 
-            $log_string .= "\n\tdetermined server addresses in domains: ".join(", ",@$tmp_domains); 
-            daemon_log("ERROR: $log_string", 1);
-            daemon_log("ERROR: $error_string", 1);
+                       my $log_string = "no gosa-si-server found!";
+                       $log_string .= "\n\tdetermined domains out of /etc/resolv.conf: ".join(", ", @domain_list) if (@domain_list);
+                       $log_string .= "\n\tdetermined server addresses in domains: ".join(", ",@$tmp_domains) if (defined($tmp_domains));
+                       daemon_log("ERROR: $log_string", 1) if (defined($log_string));
+                       daemon_log("ERROR: $error_string", 1) if (defined($error_string));
                        daemon_log("ERROR: please specify a gosa-si-server address or a domain in config file", 1);
                        kill 2, $$;
                }
@@ -1221,11 +1233,11 @@ if( defined $server_check ) {
                } 
        }
 
-    foreach my $server (@tmp_servers) { 
-        unshift(@servers, $server); 
-    }
-    my $servers_string = join(", ", @servers);
-    daemon_log("INFO: found servers in DNS: $servers_string", 1);
+       foreach my $server (@tmp_servers) { 
+               unshift(@servers, $server); 
+       }
+       my $servers_string = join(", ", @servers);
+       daemon_log("INFO: found servers in DNS: $servers_string", 1);
 }