From marcolz@stack.nl  Wed Jul 23 09:10:29 2008
Return-Path: <marcolz@stack.nl>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DBD34106567D
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 23 Jul 2008 09:10:29 +0000 (UTC)
	(envelope-from marcolz@stack.nl)
Received: from mx1.stack.nl (meestal-mk5.stack.nl [IPv6:2001:610:1108:5010::149])
	by mx1.freebsd.org (Postfix) with ESMTP id B27E68FC08
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 23 Jul 2008 09:10:29 +0000 (UTC)
	(envelope-from marcolz@stack.nl)
Received: from toad.stack.nl (toad.stack.nl [IPv6:2001:610:1108:5010::135])
	by mx1.stack.nl (Postfix) with ESMTP id 08A9A3F54A;
	Wed, 23 Jul 2008 11:10:29 +0200 (CEST)
Received: by toad.stack.nl (Postfix, from userid 333)
	id 03DF6415B; Wed, 23 Jul 2008 11:10:29 +0200 (CEST)
Message-Id: <20080723091029.03DF6415B@toad.stack.nl>
Date: Wed, 23 Jul 2008 11:10:29 +0200 (CEST)
From: Marc Olzheim <marcolz@stack.nl>
Reply-To: Marc Olzheim <marcolz@stack.nl>
To: FreeBSD-gnats-submit@freebsd.org
Cc: Marc Olzheim <marcolz@stack.nl>
Subject: [PATCH] arp manual and syntax synchronisation
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         125896
>Category:       docs
>Synopsis:       [PATCH] arp manual and syntax synchronisation
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    trhodes
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          doc-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jul 23 09:20:03 UTC 2008
>Closed-Date:    Thu Apr 02 22:07:23 UTC 2009
>Last-Modified:  Thu Apr  2 22:10:02 UTC 2009
>Originator:     Marc Olzheim
>Release:        FreeBSD 7.0-STABLE amd64
>Organization:
iphion b.v.
>Environment:
System: FreeBSD seven.dev.iphion.nl 7.0-STABLE FreeBSD 7.0-STABLE #1: Tue Jul 22 16:01:56 CEST 2008 root@seven.dev.iphion.nl:/usr/obj/usr/src/sys/SEVEN amd64


>Description:
	Although it makes no sense to do so, the most recent addition to
	arp allows for both the reject and the blackhole keywords to be
	set. Some kind of warning seems appropriate. Apart from that,
	the part of the manual describing the syntax of a file passed to
	arp -f is out of sync.
>How-To-Repeat:

>Fix:
	Patch is at:
	http://www.stack.nl/~marcolz/FreeBSD/arp.20080723.patch.txt
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-doc->sam 
Responsible-Changed-By: trhodes 
Responsible-Changed-When: Thu Dec 25 02:23:35 UTC 2008 
Responsible-Changed-Why:  
Sam made the original change to arp(8), let him decide if the 
code change is correct. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=125896 
Responsible-Changed-From-To: sam->trhodes 
Responsible-Changed-By: trhodes 
Responsible-Changed-When: Thu Dec 25 06:45:44 UTC 2008 
Responsible-Changed-Why:  
Take this PR, change committed, thanks Sam! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=125896 
State-Changed-From-To: open->patched 
State-Changed-By: trhodes 
State-Changed-When: Thu Dec 25 06:46:27 UTC 2008 
State-Changed-Why:  
Switch open->patched.  MFC pending. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=125896 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: docs/125896: commit references a PR
Date: Thu, 25 Dec 2008 06:44:28 +0000 (UTC)

 Author: trhodes
 Date: Thu Dec 25 06:44:19 2008
 New Revision: 186485
 URL: http://svn.freebsd.org/changeset/base/186485
 
 Log:
   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
 
 Modified:
   head/usr.sbin/arp/arp.8
   head/usr.sbin/arp/arp.c
 
 Modified: head/usr.sbin/arp/arp.8
 ==============================================================================
 --- head/usr.sbin/arp/arp.8	Thu Dec 25 04:29:40 2008	(r186484)
 +++ head/usr.sbin/arp/arp.8	Thu Dec 25 06:44:19 2008	(r186485)
 @@ -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.
 
 Modified: head/usr.sbin/arp/arp.c
 ==============================================================================
 --- head/usr.sbin/arp/arp.c	Thu Dec 25 04:29:40 2008	(r186484)
 +++ head/usr.sbin/arp/arp.c	Thu Dec 25 06:44:19 2008	(r186485)
 @@ -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);
  }
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: patched->closed 
State-Changed-By: trhodes 
State-Changed-When: Thu Apr 2 22:07:01 UTC 2009 
State-Changed-Why:  
MFC complete, thanks for the submission! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=125896 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: docs/125896: commit references a PR
Date: Thu,  2 Apr 2009 22:05:00 +0000 (UTC)

 Author: trhodes
 Date: Thu Apr  2 22:04:44 2009
 New Revision: 190660
 URL: http://svn.freebsd.org/changeset/base/190660
 
 Log:
   nt 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:	re (kib), sam
 
 Modified:
   stable/7/usr.sbin/arp/   (props changed)
   stable/7/usr.sbin/arp/arp.8
   stable/7/usr.sbin/arp/arp.c
 
 Modified: stable/7/usr.sbin/arp/arp.8
 ==============================================================================
 --- stable/7/usr.sbin/arp/arp.8	Thu Apr  2 21:58:34 2009	(r190659)
 +++ stable/7/usr.sbin/arp/arp.8	Thu Apr  2 22:04:44 2009	(r190660)
 @@ -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.
 
 Modified: stable/7/usr.sbin/arp/arp.c
 ==============================================================================
 --- stable/7/usr.sbin/arp/arp.c	Thu Apr  2 21:58:34 2009	(r190659)
 +++ stable/7/usr.sbin/arp/arp.c	Thu Apr  2 22:04:44 2009	(r190660)
 @@ -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 */
 @@ -630,8 +636,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);
  }
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
>Unformatted:
