bugfix gosa-si-server: update of client event module krb5.pm

[gosa.git] / gosa-si / modules / ArpHandler.pm

diff --git a/gosa-si/modules/ArpHandler.pm b/gosa-si/modules/ArpHandler.pm
index 3bc46cfd05861f2cd89c61a5bc51aba0bb9cf017..1b0997dd2453e6273c89cb38df472860de192891 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 {
@@ -94,14 +94,7 @@ sub get_module_info {
                                &main::daemon_log("Loading OUI cache file suceeded!", 6);
                        }
                }
-        my $ldap_handle = &main::get_ldap_handle();
-               if(defined($ldap_uri) && length($ldap_uri)>0) {
-                       if (!$ldap_handle) {
-                               &main::daemon_log("Could not connect to LDAP Server at $ldap_uri!\n$@", 1);
-                       }
-               } else {
-                       $ldap_handle= undef;
-               }
+               my $ldap_handle = &main::get_ldap_handle();
 
                # When interface is not configured (or 'all'), start arpwatch on all possible interfaces
                if ((!defined($arp_interface)) || $arp_interface eq 'all') {
@@ -243,7 +236,7 @@ sub get_host_from_ldap {
        my $mac=shift;
        my $result={};
                
-    my $ldap_handle = &get_ldap_handle();     
+    my $ldap_handle = &main::get_ldap_handle();     
        if(defined($ldap_handle)) {
                my $ldap_result= &search_ldap_entry(
                        $ldap_handle,