Date: Thu, 14 Jul 2011 04:21:27 +0000 (UTC) From: "Andrey V. Elsukov" <ae@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r223995 - stable/8/sys/netinet Message-ID: <201107140421.p6E4LRxr013046@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ae Date: Thu Jul 14 04:21:27 2011 New Revision: 223995 URL: http://svn.freebsd.org/changeset/base/223995 Log: MFC r223840: Add again the checking for log_arp_permanent_modify that was by accident removed in the r186119. PR: kern/154831 Modified: stable/8/sys/netinet/if_ether.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/netinet/if_ether.c ============================================================================== --- stable/8/sys/netinet/if_ether.c Thu Jul 14 03:16:43 2011 (r223994) +++ stable/8/sys/netinet/if_ether.c Thu Jul 14 04:21:27 2011 (r223995) @@ -680,11 +680,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) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201107140421.p6E4LRxr013046>