Added additional cmd checks

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

diff --git a/gosa-si/modules/ArpHandler.pm b/gosa-si/modules/ArpHandler.pm
index ded762b9ee085495d29acaf85174d64006029e46..0e551f43fbd2aae9433ec59e47b6aef2ceea6445 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 {
@@ -236,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,
@@ -271,36 +271,37 @@ sub get_host_from_ldap {
        return $result;
 }
 
+# moved to GosaSupportDaemon: 03-06-2008: rettenbe
 #===  FUNCTION  ================================================================
 #         NAME:  get_interfaces 
 #   PARAMETERS:  none
 #      RETURNS:  (list of interfaces) 
 #  DESCRIPTION:  Uses proc fs (/proc/net/dev) to get list of interfaces.
 #===============================================================================
-sub get_interfaces {
-       my @result;
-       my $PROC_NET_DEV= ('/proc/net/dev');
-
-       open(PROC_NET_DEV, "<$PROC_NET_DEV")
-               or die "Could not open $PROC_NET_DEV";
-
-       my @ifs = <PROC_NET_DEV>;
-
-       close(PROC_NET_DEV);
-
-       # Eat first two line
-       shift @ifs;
-       shift @ifs;
-
-       chomp @ifs;
-       foreach my $line(@ifs) {
-               my $if= (split /:/, $line)[0];
-               $if =~ s/^\s+//;
-               push @result, $if;
-       }
-
-       return @result;
-}
+#sub get_interfaces {
+#      my @result;
+#      my $PROC_NET_DEV= ('/proc/net/dev');
+#
+#      open(PROC_NET_DEV, "<$PROC_NET_DEV")
+#              or die "Could not open $PROC_NET_DEV";
+#
+#      my @ifs = <PROC_NET_DEV>;
+#
+#      close(PROC_NET_DEV);
+#
+#      # Eat first two line
+#      shift @ifs;
+#      shift @ifs;
+#
+#      chomp @ifs;
+#      foreach my $line(@ifs) {
+#              my $if= (split /:/, $line)[0];
+#              $if =~ s/^\s+//;
+#              push @result, $if;
+#      }
+#
+#      return @result;
+#}
 
 #===  FUNCTION  ================================================================
 #         NAME:  get_mac