Author: ae
Date: Thu Jul  7 11:59:51 2011
New Revision: 223840
URL: http://svn.freebsd.org/changeset/base/223840

Log:
  Add again the checking for log_arp_permanent_modify that was by accident
  removed in the r186119.
  
  PR:           kern/154831
  MFC after:    1 week

Modified:
  head/sys/netinet/if_ether.c

Modified: head/sys/netinet/if_ether.c
==============================================================================
--- head/sys/netinet/if_ether.c Thu Jul  7 10:37:14 2011        (r223839)
+++ head/sys/netinet/if_ether.c Thu Jul  7 11:59:51 2011        (r223840)
@@ -694,11 +694,13 @@ match:
                    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) {
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to