summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Pascoe <pascoe@cvs.openbsd.org>2005-01-04 10:57:24 +0000
committerChristopher Pascoe <pascoe@cvs.openbsd.org>2005-01-04 10:57:24 +0000
commit91ba1bd4ee38b894884314769079280f4175b6fd (patch)
tree53fe900ee7580a97ed2aac5930ed184d68c6e39f
parent18e8be30ac9a147ec66ad94e1447e74752d91dfc (diff)
Enable ARP table manipulation on CARP interfaces.
ok niklas@ mcbride@
-rw-r--r--usr.sbin/arp/arp.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/arp/arp.c b/usr.sbin/arp/arp.c
index 3995658af6b..b9218195a85 100644
--- a/usr.sbin/arp/arp.c
+++ b/usr.sbin/arp/arp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: arp.c,v 1.30 2003/06/27 22:11:39 deraadt Exp $ */
+/* $OpenBSD: arp.c,v 1.31 2005/01/04 10:57:23 pascoe Exp $ */
/* $NetBSD: arp.c,v 1.12 1995/04/24 13:25:18 cgd Exp $ */
/*
@@ -41,7 +41,7 @@ static char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)arp.c 8.2 (Berkeley) 1/2/94";*/
-static char *rcsid = "$OpenBSD: arp.c,v 1.30 2003/06/27 22:11:39 deraadt Exp $";
+static char *rcsid = "$OpenBSD: arp.c,v 1.31 2005/01/04 10:57:23 pascoe Exp $";
#endif /* not lint */
/*
@@ -303,7 +303,7 @@ tryagain:
!(rtm->rtm_flags & RTF_GATEWAY)) {
switch (sdl->sdl_type) {
case IFT_ETHER: case IFT_FDDI: case IFT_ISO88023:
- case IFT_ISO88024: case IFT_ISO88025:
+ case IFT_ISO88024: case IFT_ISO88025: case IFT_CARP:
goto overwrite;
}
}
@@ -384,7 +384,7 @@ tryagain:
!(rtm->rtm_flags & RTF_GATEWAY)) {
switch (sdl->sdl_type) {
case IFT_ETHER: case IFT_FDDI: case IFT_ISO88023:
- case IFT_ISO88024: case IFT_ISO88025:
+ case IFT_ISO88024: case IFT_ISO88025: case IFT_CARP:
goto delete;
}
}