amd64/154831: [patch] arp sysctl setting log_arp_permanent_modify has no effect

[Andrew Boyer]

>Number:         154831
>Category:       amd64
>Synopsis:       [patch] arp sysctl setting log_arp_permanent_modify has no effect
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-amd64
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Feb 16 23:20:08 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Andrew Boyer
>Release:        stable/8
>Organization:
Avere Systems
>Environment:
N/A
>Description:
SVN 153513 added a sysctl, net.link.ether.inet.log_arp_permanent_modify, which does not do anything since SVN 186119.  It is simple to re-add.
>How-To-Repeat:
(Develop a networking problem like I've got...)
- Turn off logging with 'sysctl net.link.ether.inet.log_arp_permanent_modify=0'
- Observe that the log messages still appear
>Fix:


Patch attached with submission follows:

Index: sys/netinet/if_ether.c
===================================================================
--- sys/netinet/if_ether.c	(revision 218760)
+++ sys/netinet/if_ether.c	(working copy)
@@ -693,11 +693,13 @@
 		    bcmp(ar_sha(ah), &la->ll_addr, ifp->if_addrlen)) {
 			if (la->la_flags & LLE_STATIC) {
 				LLE_WUNLOCK(la);
-				log(LOG_ERR,
-				    "arp: %*D attempts to modify permanent "
-				    "entry for %s on %s\n",
-				    ifp->if_addrlen, (u_char *)ar_sha(ah), ":",
-				    inet_ntoa(isaddr), ifp->if_xname);
+				if (log_arp_permanent_modify) {
+					log(LOG_ERR,
+					    "arp: %*D attempts to modify permanent "
+					    "entry for %s on %s\n",
+					    ifp->if_addrlen, (u_char *)ar_sha(ah), ":",
+					    inet_ntoa(isaddr), ifp->if_xname);
+				}
 				goto reply;
 			}
 			if (log_arp_movements) {


>Release-Note:
>Audit-Trail:
>Unformatted: