index fec419de2e9cb68520eaa87c6576b3703ca87dde..1b0997dd2453e6273c89cb38df472860de192891 100644 (file)
use Switch;
use Data::Dumper;
use Socket;
-use utf8;
# Don't start if some of the modules are missing
my $start_service=1;
#===============================================================================
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 {
&main::daemon_log("Loading OUI cache file suceeded!", 6);
}
}
- if(defined($ldap_uri) && length($ldap_uri)>0) {
- &main::refresh_ldap_handle();
- if (!$main::ldap_handle) {
- &main::daemon_log("Could not connect to LDAP Server at $ldap_uri!\n$@", 1);
- }
- } else {
- $main::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') {
my $capture_device = sprintf "%s", $kernel->alias_list($sender) =~ /^arp_watch_(.*)$/;
- if(!exists($hosts_database->{$packet->{source_haddr}})) {
+ my $ldap_handle = &main::get_ldap_handle();
+ if(!exists($hosts_database->{$packet->{source_haddr}})) {
my $dnsname= gethostbyaddr(inet_aton($packet->{source_ipaddr}), AF_INET) || $packet->{source_ipaddr};
my $ldap_result=&get_host_from_ldap($packet->{source_haddr});
if(exists($ldap_result->{dn})) {
": ".$hosts_database->{$packet->{source_haddr}}->{ipHostNumber}.
"/".$hosts_database->{$packet->{source_haddr}}->{macAddress},4);
&add_ldap_entry(
- $main::ldap_handle,
+ $ldap_handle,
$ldap_base,
$hosts_database->{$packet->{source_haddr}}->{macAddress},
'new-system',
"->".$packet->{source_ipaddr}, 4);
$hosts_database->{$packet->{source_haddr}}->{ipHostNumber}= $packet->{source_ipaddr};
&change_ldap_entry(
- $main::ldap_handle,
+ $ldap_handle,
$ldap_base,
$hosts_database->{$packet->{source_haddr}}->{macAddress},
'ip-changed',
my $mac=shift;
my $result={};
- if(defined($main::ldap_handle)) {
+ my $ldap_handle = &main::get_ldap_handle();
+ if(defined($ldap_handle)) {
my $ldap_result= &search_ldap_entry(
- $main::ldap_handle,
+ $ldap_handle,
$ldap_base,
"(|(macAddress=$mac)(dhcpHWAddress=ethernet $mac))"
);
if (defined($ip)) {
$replace->{'ipHostNumber'} = $ip;
}
- my $result = $main::ldap_handle->modify( $dn, replace => $replace );
+ my $result = $ldap_tree->modify( $dn, replace => $replace );
# for $result->code constants please look at Net::LDAP::Constant
if($result->code == 32) { # entry doesnt exists