New config option in ArpHandler to control if existing entries should be updated...

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

diff --git a/gosa-si/modules/ArpHandler.pm b/gosa-si/modules/ArpHandler.pm
index f44d72976fddba51a982ef0c72a96017d87a79e9..144d72b55ac6824ce21db12a3311ddb562f8f5d0 100644 (file)
--- a/gosa-si/modules/ArpHandler.pm
+++ b/gosa-si/modules/ArpHandler.pm
@@ -34,7 +34,7 @@ BEGIN{
 END{}
 
 my ($timeout, $mailto, $mailfrom, $user, $group);
-my ($arp_enabled, $arp_interface, $ldap_uri, $ldap_base, $ldap_admin_dn, $ldap_admin_password);
+my ($arp_enabled, $arp_interface, $arp_update, $ldap_uri, $ldap_base, $ldap_admin_dn, $ldap_admin_password);
 my $hosts_database={};
 my $ldap;
 
@@ -43,6 +43,7 @@ my %cfg_defaults =
     "ArpHandler" => {
         "enabled"             => [\$arp_enabled,         "true"],
         "interface"           => [\$arp_interface,       "all"],
+        "update-entries"      => [\$arp_update,          "false"],
     },
     "server" => {
         "ldap-uri"            => [\$ldap_uri,            ""],
@@ -78,9 +79,7 @@ sub local_read_configfile {
 }
 
 sub get_module_info {
-       my @info = (undef,
-               undef,
-       );
+       my @info = (undef, undef);
 
        &local_read_configfile();
        # Don't start if some of the modules are missing
@@ -94,7 +93,6 @@ sub get_module_info {
                                &main::daemon_log("Loading OUI cache file suceeded!", 6);
                        }
                }
-               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') {
@@ -174,7 +172,7 @@ sub got_packet {
     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})) {
+               if(exists($ldap_result->{dn}) and $arp_update eq "true") {
                        $hosts_database->{$packet->{source_haddr}}=$ldap_result;
                        $hosts_database->{$packet->{source_haddr}}->{dnsname}= $dnsname;
                        if(!exists($ldap_result->{ipHostNumber})) {
@@ -213,7 +211,7 @@ sub got_packet {
                }
                $hosts_database->{$packet->{source_haddr}}->{device}= $capture_device;
        } else {
-               if(!($hosts_database->{$packet->{source_haddr}}->{ipHostNumber} eq $packet->{source_ipaddr})) {
+               if(($arp_update eq "true") and !($hosts_database->{$packet->{source_haddr}}->{ipHostNumber} eq $packet->{source_ipaddr})) {
                        &main::daemon_log(
                                "IP Address change of MAC ".$packet->{source_haddr}.
                                ": ".$hosts_database->{$packet->{source_haddr}}->{ipHostNumber}.