Fixed robustness..

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@10278 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-si/gosa-si-client b/gosa-si/gosa-si-client
index c8116dc938fb0ddbcbc106ac1e3b38e67f504823..d9bf2393d29dd576ce5850a5106a87a3e39ecf01 100755 (executable)
--- a/gosa-si/gosa-si-client
+++ b/gosa-si/gosa-si-client
@@ -150,7 +150,7 @@ sub check_cmdline_param () {
 sub read_configfile {
     my ($cfg_file, %cfg_defaults) = @_ ;
     my $cfg;
-    if( defined( $cfg_file) && ( length($cfg_file) > 0 )) {
+    if( defined( $cfg_file) && ( (-s $cfg_file) > 0 )) {
         if( -r $cfg_file ) {
             $cfg = Config::IniFiles->new( -file => $cfg_file );
         } else {
@@ -162,7 +162,7 @@ sub read_configfile {
     foreach my $section (keys %cfg_defaults) {
         foreach my $param (keys %{$cfg_defaults{ $section }}) {
             my $pinfo = $cfg_defaults{ $section }{ $param };
-           ${@$pinfo[ 0 ]} = (defined($cfg))?$cfg->val( $section, $param, @$pinfo[ 1 ] ):${@$pinfo[ 0 ]} = @$pinfo[ 1 ];
+           ${@$pinfo[ 0 ]} = $cfg->val( $section, $param, @$pinfo[ 1 ] );
         }
     }
 }

diff --git a/gosa-si/gosa-si-server b/gosa-si/gosa-si-server
index d665e58c89b1c3973091e918552595a919121819..9d48dc4ff217c3804045b8075108a3476f52f743 100755 (executable)
--- a/gosa-si/gosa-si-server
+++ b/gosa-si/gosa-si-server
@@ -241,7 +241,7 @@ EOF
 #===============================================================================
 sub read_configfile {
     my $cfg;
-    if( defined( $cfg_file) && ( length($cfg_file) > 0 )) {
+    if( defined( $cfg_file) && ( (-s $cfg_file) > 0 )) {
         if( -r $cfg_file ) {
             $cfg = Config::IniFiles->new( -file => $cfg_file );
         } else {
@@ -253,7 +253,7 @@ sub read_configfile {
     foreach my $section (keys %cfg_defaults) {
         foreach my $param (keys %{$cfg_defaults{ $section }}) {
             my $pinfo = $cfg_defaults{ $section }{ $param };
-            ${@$pinfo[ 0 ]} = (defined($cfg))?$cfg->val( $section, $param, @$pinfo[ 1 ] ):@$pinfo[ 1 ];
+            ${@$pinfo[ 0 ]} = $cfg->val( $section, $param, @$pinfo[ 1 ] );
         }
     }
 }

diff --git a/gosa-si/modules/ArpHandler.pm b/gosa-si/modules/ArpHandler.pm
index ded762b9ee085495d29acaf85174d64006029e46..549afed52654af7c984695dd13a3d53f57af569b 100644 (file)
--- a/gosa-si/modules/ArpHandler.pm
+++ b/gosa-si/modules/ArpHandler.pm
@@ -60,7 +60,7 @@ my %cfg_defaults =
 #===============================================================================
 sub read_configfile {
        my $cfg;
-       if( defined( $main::cfg_file) && ( length($main::cfg_file) > 0 )) {
+       if( defined( $main::cfg_file) && ( (-s $main::cfg_file) > 0 )) {
                if( -r $main::cfg_file ) {
                        $cfg = Config::IniFiles->new( -file => $main::cfg_file );
                } else {

diff --git a/gosa-si/modules/GosaPackages.pm b/gosa-si/modules/GosaPackages.pm
index b1d207f74230360b0d448b5f7e15db38d32439fb..25127ad060f78c3692a1daa8a381705f46f02e8c 100644 (file)
--- a/gosa-si/modules/GosaPackages.pm
+++ b/gosa-si/modules/GosaPackages.pm
@@ -82,7 +82,7 @@ sub get_module_info {
 #===============================================================================
 sub read_configfile {
     my $cfg;
-    if( defined( $main::cfg_file) && ( length($main::cfg_file) > 0 )) {
+    if( defined( $main::cfg_file) && ( (-s $main::cfg_file) > 0 )) {
         if( -r $main::cfg_file ) {
             $cfg = Config::IniFiles->new( -file => $main::cfg_file );
         } else {

diff --git a/gosa-si/modules/SIPackages.pm b/gosa-si/modules/SIPackages.pm
index 4f7bd8611dedec2cd1dae64768424fa369a409f7..960c666cd81b08f25714ef5ed914cf1fc2331269 100644 (file)
--- a/gosa-si/modules/SIPackages.pm
+++ b/gosa-si/modules/SIPackages.pm
@@ -192,7 +192,7 @@ sub get_module_info {
 #===============================================================================
 sub read_configfile {
     my $cfg;
-    if( defined( $main::cfg_file) && ( length($main::cfg_file) > 0 )) {
+    if( defined( $main::cfg_file) && ( (-s $main::cfg_file) > 0 )) {
         if( -r $main::cfg_file ) {
             $cfg = Config::IniFiles->new( -file => $main::cfg_file );
         } else {

diff --git a/gosa-si/server/events/clMessages.pm b/gosa-si/server/events/clMessages.pm
index 6cdfd7f7d2c98bce5a80c71f21e70bb1e2a28c5f..486a6e2a43a28aed8c1c5017772471d3b9a090f3 100644 (file)
--- a/gosa-si/server/events/clMessages.pm
+++ b/gosa-si/server/events/clMessages.pm
@@ -55,7 +55,7 @@ sub read_configfile {
     my ($cfg_file, %cfg_defaults) = @_;
     my $cfg;
 
-    if( defined( $cfg_file) && ( length($cfg_file) > 0 )) {
+    if( defined( $cfg_file) && ( (-s $cfg_file) > 0 )) {
         if( -r $cfg_file ) {
             $cfg = Config::IniFiles->new( -file => $cfg_file );
         } else {

diff --git a/gosa-si/server/events/siTriggered.pm b/gosa-si/server/events/siTriggered.pm
index bde782956c487266d7073a7d29117fe0a12d2e97..2ae7a78bd3e2d54881f4e9ab86a7c6c51c22c5e5 100644 (file)
--- a/gosa-si/server/events/siTriggered.pm
+++ b/gosa-si/server/events/siTriggered.pm
@@ -47,7 +47,7 @@ sub read_configfile {
     my ($cfg_file, %cfg_defaults) = @_;
     my $cfg;
 
-    if( defined( $cfg_file) && ( length($cfg_file) > 0 )) {
+    if( defined( $cfg_file) && ( (-s $cfg_file) > 0 )) {
         if( -r $cfg_file ) {
             $cfg = Config::IniFiles->new( -file => $cfg_file );
         } else {