diff options
| author | trhodes <trhodes@FreeBSD.org> | 2008-12-25 06:44:19 +0000 |
|---|---|---|
| committer | trhodes <trhodes@FreeBSD.org> | 2008-12-25 06:44:19 +0000 |
| commit | 1f8fc18328a41849ff90d5fc313563369fe9b04e (patch) | |
| tree | 6ff5cec934da3d220ac3de72b9121b415e8d84a2 /usr.sbin/arp | |
| parent | e11a965a41ee3db94e74beaca584fb0f5912a4ad (diff) | |
| download | FreeBSD-src-1f8fc18328a41849ff90d5fc313563369fe9b04e.zip FreeBSD-src-1f8fc18328a41849ff90d5fc313563369fe9b04e.tar.gz | |
Print a warning when blackhole and reject are used together.
Update arp.8 manual page syntax.
PR: 125896
Submitted by: Marc Olzheim <marcolz@stack.nl>
Approved by: sam
Diffstat (limited to 'usr.sbin/arp')
| -rw-r--r-- | usr.sbin/arp/arp.8 | 11 | ||||
| -rw-r--r-- | usr.sbin/arp/arp.c | 10 |
2 files changed, 13 insertions, 8 deletions
diff --git a/usr.sbin/arp/arp.8 b/usr.sbin/arp/arp.8 index 7850a55..9dbe45a 100644 --- a/usr.sbin/arp/arp.8 +++ b/usr.sbin/arp/arp.8 @@ -28,7 +28,7 @@ .\" @(#)arp.8 8.1 (Berkeley) 6/6/93 .\" $FreeBSD$ .\" -.Dd March 18, 2008 +.Dd December 25, 2008 .Dt ARP 8 .Os .Sh NAME @@ -53,14 +53,12 @@ .Nm .Fl s Ar hostname ether_addr .Op Cm temp -.Op Cm reject -.Op Cm blackhole +.Op Cm blackhole No \&| Cm reject .Op Cm pub Op Cm only .Nm .Fl S Ar hostname ether_addr .Op Cm temp -.Op Cm reject -.Op Cm blackhole +.Op Cm blackhole No \&| Cm reject .Op Cm pub Op Cm only .Nm .Fl f Ar filename @@ -182,7 +180,8 @@ in the file should be of the form .Bd -ragged -offset indent -compact .Ar hostname ether_addr .Op Cm temp -.Op Cm pub +.Op Cm blackhole No \&| Cm reject +.Op Cm pub Op Cm only .Ed .Pp with argument meanings as given above. diff --git a/usr.sbin/arp/arp.c b/usr.sbin/arp/arp.c index 4154c3a1..ab3587c 100644 --- a/usr.sbin/arp/arp.c +++ b/usr.sbin/arp/arp.c @@ -330,8 +330,14 @@ set(int argc, char **argv) argc--; argv++; } } else if (strncmp(argv[0], "blackhole", 9) == 0) { + if (flags & RTF_REJECT) { + printf("Choose one of blackhole or reject, not both.\n"); + } flags |= RTF_BLACKHOLE; } else if (strncmp(argv[0], "reject", 6) == 0) { + if (flags & RTF_BLACKHOLE) { + printf("Choose one of blackhole or reject, not both.\n"); + } flags |= RTF_REJECT; } else if (strncmp(argv[0], "trail", 5) == 0) { /* XXX deprecated and undocumented feature */ @@ -648,8 +654,8 @@ usage(void) " arp [-n] [-i interface] -a", " arp -d hostname [pub]", " arp -d [-i interface] -a", - " arp -s hostname ether_addr [temp] [reject] [blackhole] [pub [only]]", - " arp -S hostname ether_addr [temp] [reject] [blackhole] [pub [only]]", + " arp -s hostname ether_addr [temp] [reject | blackhole] [pub [only]]", + " arp -S hostname ether_addr [temp] [reject | blackhole] [pub [only]]", " arp -f filename"); exit(1); } |
