[src/netbsd-1-4]: src/sys/netinet pullup 1.57->1.58 (is)

[perry <perry%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/98877401b518
branches:  netbsd-1-4
changeset: 468638:98877401b518
user:      perry <perry%NetBSD.org@localhost>
date:      Tue May 04 22:28:45 1999 +0000

description:
pullup 1.57->1.58 (is)

diffstat:

 sys/netinet/if_arp.c |  11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diffs (25 lines):

diff -r 09c05f8a5aa3 -r 98877401b518 sys/netinet/if_arp.c
--- a/sys/netinet/if_arp.c      Tue May 04 20:01:32 1999 +0000
+++ b/sys/netinet/if_arp.c      Tue May 04 22:28:45 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_arp.c,v 1.56.2.1 1999/05/04 20:01:32 perry Exp $    */
+/*     $NetBSD: if_arp.c,v 1.56.2.2 1999/05/04 22:28:45 perry Exp $    */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -593,7 +593,14 @@
        if (la && (rt = la->la_rt) && (sdl = SDL(rt->rt_gateway))) {
                if (sdl->sdl_alen &&
                    bcmp((caddr_t)ar_sha(ah), LLADDR(sdl), sdl->sdl_alen)) {
-                       if (rt->rt_ifp != ifp) {
+                       if (rt->rt_flags & RTF_STATIC) {
+                               log(LOG_INFO,
+                                   "%s tried to overwrite permanent arp info"
+                                   " for %s\n",
+                                   lla_snprintf(ar_sha(ah), ah->ar_hln),
+                                   in_fmtaddr(isaddr));
+                               goto out;
+                       } else if (rt->rt_ifp != ifp) {
                                log(LOG_INFO,
                                    "%s on %s tried to overwrite "
                                    "arp info for %s on %s\n",