Simplify and unify wording for the -I sourceaddr option in various places.

This is somewhat related to the "-b bind_addr" option some programs have,
which should get some cleanup also...
input florian claudio jmc

10 files changed, 54 insertions, 64 deletions

diff --git a/sbin/ping/ping.8 b/sbin/ping/ping.8
index bbf541596fe..259a6f363d1 100644
--- a/sbin/ping/ping.8
+++ b/sbin/ping/ping.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ping.8,v 1.62 2020/01/04 01:00:18 cheloha Exp $
+.\"	$OpenBSD: ping.8,v 1.63 2020/02/11 18:41:39 deraadt Exp $
 .\"	$NetBSD: ping.8,v 1.10 1995/12/31 04:55:35 ghudson Exp $
 .\"
 .\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -57,7 +57,7 @@
 .\"
 .\"     @(#)ping.8	8.2 (Berkeley) 12/11/93
 .\"
-.Dd $Mdocdate: January 4 2020 $
+.Dd $Mdocdate: February 11 2020 $
 .Dt PING 8
 .Os
 .Sh NAME
@@ -68,7 +68,7 @@
 .Nm ping
 .Op Fl DdEefHLnqRv
 .Op Fl c Ar count
-.Op Fl I Ar ifaddr
+.Op Fl I Ar sourceaddr
 .Op Fl i Ar interval
 .Op Fl l Ar preload
 .Op Fl p Ar pattern
@@ -156,9 +156,9 @@ Try reverse lookups for addresses.
 .It Fl h Ar hoplimit
 .Pq IPv6 only
 Set the hoplimit.
-.It Fl I Ar ifaddr
-Specify the interface address to transmit from
-on machines with multiple interfaces.
+.It Fl I Ar sourceaddr
+Set the source address to transmit from, which is useful on machines
+with multiple interfaces.
 For unicast and multicast pings.
 .It Fl i Ar interval
 Send one packet every
diff --git a/sbin/ping/ping.c b/sbin/ping/ping.c
index c870234dac2..238a3798d3a 100644
--- a/sbin/ping/ping.c
+++ b/sbin/ping/ping.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ping.c,v 1.239 2020/01/04 01:00:18 cheloha Exp $	*/
+/*	$OpenBSD: ping.c,v 1.240 2020/02/11 18:41:39 deraadt Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -2191,7 +2191,7 @@ usage(void)
 		    "\t[-V rtable] [-w maxwait] host\n");
 	} else {
 		fprintf(stderr,
-		    "usage: ping [-DdEefHLnqRv] [-c count] [-I ifaddr] "
+		    "usage: ping [-DdEefHLnqRv] [-c count] [-I sourceaddr] "
 		    "[-i interval]\n\t[-l preload] [-p pattern] [-s packetsize]"
 #ifndef	SMALL
 		    " [-T toskeyword]"
diff --git a/usr.bin/ftp/ftp.1 b/usr.bin/ftp/ftp.1
index 48cf4362775..ac11a39bb9f 100644
--- a/usr.bin/ftp/ftp.1
+++ b/usr.bin/ftp/ftp.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ftp.1,v 1.118 2020/01/16 16:46:47 schwarze Exp $
+.\"	$OpenBSD: ftp.1,v 1.119 2020/02/11 18:41:39 deraadt Exp $
 .\"	$NetBSD: ftp.1,v 1.22 1997/08/18 10:20:22 lukem Exp $
 .\"
 .\" Copyright (c) 1985, 1989, 1990, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"	@(#)ftp.1	8.3 (Berkeley) 10/9/94
 .\"
-.Dd $Mdocdate: January 16 2020 $
+.Dd $Mdocdate: February 11 2020 $
 .Dt FTP 1
 .Os
 .Sh NAME
@@ -43,13 +43,13 @@
 .Op Fl k Ar seconds
 .Op Fl P Ar port
 .Op Fl r Ar seconds
-.Op Fl s Ar srcaddr
+.Op Fl s Ar sourceaddr
 .Op Ar host Op Ar port
 .Nm ftp
 .Op Fl C
 .Op Fl N Ar name
 .Op Fl o Ar output
-.Op Fl s Ar srcaddr
+.Op Fl s Ar sourceaddr
 .Sm off
 .Pf ftp:// Op Ar user : password No @
 .Ar host Op : Ar port
@@ -62,7 +62,7 @@
 .Op Fl N Ar name
 .Op Fl o Ar output
 .Op Fl S Ar ssl_options
-.Op Fl s Ar srcaddr
+.Op Fl s Ar sourceaddr
 .Op Fl U Ar useragent
 .Op Fl w Ar seconds
 .Sm off
@@ -76,13 +76,13 @@
 .Op Fl C
 .Op Fl N Ar name
 .Op Fl o Ar output
-.Op Fl s Ar srcaddr
+.Op Fl s Ar sourceaddr
 .Pf file: Ar
 .Nm ftp
 .Op Fl C
 .Op Fl N Ar name
 .Op Fl o Ar output
-.Op Fl s Ar srcaddr
+.Op Fl s Ar sourceaddr
 .Ar host : Ns / Ns Ar file Ns Op /
 .Ar ...
 .Sh DESCRIPTION
@@ -280,12 +280,9 @@ or
 setting is provided,
 .Pa /etc/ssl/cert.pem
 will be used.
-.It Fl s Ar srcaddr
-Use
-.Ar srcaddr
-on the local machine as the source address
-of the connection.
-Only useful on systems with more than one address.
+.It Fl s Ar sourceaddr
+Set the source address for connections, which is useful on machines
+with multiple interfaces.
 .It Fl t
 Enables packet tracing.
 .It Fl U Ar useragent
diff --git a/usr.bin/ftp/main.c b/usr.bin/ftp/main.c
index 5f32501f161..d29caa7e09f 100644
--- a/usr.bin/ftp/main.c
+++ b/usr.bin/ftp/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.130 2019/10/23 16:48:59 deraadt Exp $	*/
+/*	$OpenBSD: main.c,v 1.131 2020/02/11 18:41:39 deraadt Exp $	*/
 /*	$NetBSD: main.c,v 1.24 1997/08/18 10:20:26 lukem Exp $	*/
 
 /*
@@ -945,15 +945,15 @@ usage(void)
 #ifndef SMALL
 	    "ftp [-46AadEegiMmnptVv] [-D title] [-k seconds] [-P port] "
 	    "[-r seconds]\n"
-	    "           [-s srcaddr] [host [port]]\n"
-	    "       ftp [-C] [-N name] [-o output] [-s srcaddr]\n"
+	    "           [-s sourceaddr] [host [port]]\n"
+	    "       ftp [-C] [-N name] [-o output] [-s sourceaddr]\n"
 	    "           ftp://[user:password@]host[:port]/file[/] ...\n"
 	    "       ftp [-C] [-c cookie] [-N name] [-o output] [-S ssl_options] "
-	    "[-s srcaddr]\n"
+	    "[-s sourceaddr]\n"
 	    "           [-U useragent] [-w seconds] "
 	    "http[s]://[user:password@]host[:port]/file ...\n"
-	    "       ftp [-C] [-N name] [-o output] [-s srcaddr] file:file ...\n"
-	    "       ftp [-C] [-N name] [-o output] [-s srcaddr] host:/file[/] ...\n"
+	    "       ftp [-C] [-N name] [-o output] [-s sourceaddr] file:file ...\n"
+	    "       ftp [-C] [-N name] [-o output] [-s sourceaddr] host:/file[/] ...\n"
 #else /* !SMALL */
 	    "ftp [-N name] [-o output] "
 	    "ftp://[user:password@]host[:port]/file[/] ...\n"
diff --git a/usr.bin/rsync/main.c b/usr.bin/rsync/main.c
index d348c5ffaec..17f0beef34f 100644
--- a/usr.bin/rsync/main.c
+++ b/usr.bin/rsync/main.c
@@ -1,4 +1,4 @@
-/*	$Id: main.c,v 1.48 2019/08/09 05:28:01 claudio Exp $ */
+/*	$Id: main.c,v 1.49 2020/02/11 18:41:39 deraadt Exp $ */
 /*
  * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -509,7 +509,7 @@ main(int argc, char *argv[])
 	exit(rc);
 usage:
 	fprintf(stderr, "usage: %s"
-	    " [-aDglnoprtvx] [-e program] [--address=bind_address] [--del]\n"
+	    " [-aDglnoprtvx] [-e program] [--address=sourceaddr] [--del]\n"
 	    "\t[--numeric-ids] [--port=portnumber] [--rsync-path=program]\n"
 	    "\t[--version] source ... directory\n",
 	    getprogname());
diff --git a/usr.bin/rsync/rsync.1 b/usr.bin/rsync/rsync.1
index 243921f56a7..aa1f4696615 100644
--- a/usr.bin/rsync/rsync.1
+++ b/usr.bin/rsync/rsync.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rsync.1,v 1.20 2020/01/04 11:53:53 schwarze Exp $
+.\"	$OpenBSD: rsync.1,v 1.21 2020/02/11 18:41:39 deraadt Exp $
 .\"
 .\" Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: January 4 2020 $
+.Dd $Mdocdate: February 11 2020 $
 .Dt OPENRSYNC 1
 .Os
 .Sh NAME
@@ -24,7 +24,7 @@
 .Nm openrsync
 .Op Fl aDglnoprtvx
 .Op Fl e Ar program
-.Op Fl -address Ns = Ns Ar bind_address
+.Op Fl -address Ns = Ns Ar sourceaddr
 .Op Fl -del
 .Op Fl -numeric-ids
 .Op Fl -port Ns = Ns Ar service
@@ -51,12 +51,11 @@ The arguments are as follows:
 .It Fl a , -archive
 Shorthand for
 .Fl Dgloprt .
-.It Fl -address Ns = Ns Ar bind_address
-Use
-.Ar bind_address
-on the local machine as the source address of the connection.
-Only useful when connecting to an rsync daemon and on systems with more than
-one address.
+.It Fl -address Ns = Ns Ar sourceaddr
+When connecting to an rsync daemon, use
+.Ar sourceaddr
+as the source address for connections, which is useful on machines with
+multiple interfaces.
 .It Fl D
 Also transfer device and special files.
 Shorthand for
diff --git a/usr.sbin/rpki-client/main.c b/usr.sbin/rpki-client/main.c
index 3fa0171cd72..06914bae0d4 100644
--- a/usr.sbin/rpki-client/main.c
+++ b/usr.sbin/rpki-client/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.57 2019/12/16 10:40:56 claudio Exp $ */
+/*	$OpenBSD: main.c,v 1.58 2020/02/11 18:41:39 deraadt Exp $ */
 /*
  * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -1685,7 +1685,7 @@ main(int argc, char *argv[])
 
 usage:
 	fprintf(stderr,
-	    "usage: rpki-client [-Bcfjnov] [-b bind_addr] [-d cachedir]"
+	    "usage: rpki-client [-Bcfjnov] [-b sourceaddr] [-d cachedir]"
 	    " [-e rsync_prog]\n"
 	    "            [-T table] [-t tal] [outputdir]\n");
 	return 1;
diff --git a/usr.sbin/rpki-client/rpki-client.8 b/usr.sbin/rpki-client/rpki-client.8
index dc6ae634b8a..f6c85a167cf 100644
--- a/usr.sbin/rpki-client/rpki-client.8
+++ b/usr.sbin/rpki-client/rpki-client.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rpki-client.8,v 1.19 2019/12/19 17:31:03 jmc Exp $
+.\"	$OpenBSD: rpki-client.8,v 1.20 2020/02/11 18:41:39 deraadt Exp $
 .\"
 .\" Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: December 19 2019 $
+.Dd $Mdocdate: February 11 2020 $
 .Dt RPKI-CLIENT 8
 .Os
 .Sh NAME
@@ -23,7 +23,7 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl Bcfjnov
-.Op Fl b Ar bind_addr
+.Op Fl b Ar sourceaddr
 .Op Fl d Ar cachedir
 .Op Fl e Ar rsync_prog
 .Op Fl T Ar table
@@ -52,10 +52,11 @@ The options are as follows:
 Create output in the file
 .Pa bird
 in the output directory which is suitable for the BIRD internet routing daemon.
-.It Fl b Ar bind_addr
-Tell the rsync client to use the specified
-.Ar bind_addr
-as the source address for connections.
+.It Fl b Ar sourceaddr
+Tell the rsync client to use
+.Ar sourceaddr
+as the source address for connections, which is useful on machines
+with multiple interfaces.
 .It Fl c
 Create output in the file
 .Pa csv
diff --git a/usr.sbin/traceroute/traceroute.8 b/usr.sbin/traceroute/traceroute.8
index a8a5201a367..3327dd18628 100644
--- a/usr.sbin/traceroute/traceroute.8
+++ b/usr.sbin/traceroute/traceroute.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: traceroute.8,v 1.68 2019/04/05 14:56:48 sthen Exp $
+.\"	$OpenBSD: traceroute.8,v 1.69 2020/02/11 18:41:39 deraadt Exp $
 .\"	$NetBSD: traceroute.8,v 1.6 1995/10/12 03:05:50 mycroft Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
@@ -33,7 +33,7 @@
 .\"
 .\"	@(#)traceroute.8	8.1 (Berkeley) 6/6/93
 .\"
-.Dd $Mdocdate: April 5 2019 $
+.Dd $Mdocdate: February 11 2020 $
 .Dt TRACEROUTE 8
 .Os
 .Sh NAME
@@ -49,7 +49,7 @@
 .Op Fl P Ar proto
 .Op Fl p Ar port
 .Op Fl q Ar nqueries
-.Op Fl s Ar src_addr
+.Op Fl s Ar sourceaddr
 .Op Fl t Ar toskeyword
 .Op Fl V Ar rtable
 .Op Fl w Ar waittime
@@ -61,7 +61,7 @@
 .Op Fl m Ar max_hop
 .Op Fl p Ar port
 .Op Fl q Ar nqueries
-.Op Fl s Ar src_addr
+.Op Fl s Ar sourceaddr
 .Op Fl t Ar toskeyword
 .Op Fl V Ar rtable
 .Op Fl w Ar waittime
@@ -162,16 +162,9 @@ Set the number of probes per TTL to
 The default is three probes.
 .It Fl S
 Print how many probes were not answered for each hop.
-.It Fl s Ar src_addr
-Use the following IP address
-(which must be given as an IP number, not
-a hostname) as the source address in outgoing probe packets.
-On hosts with more than one IP address, this option can be used to
-force the source address to be something other than the IP address
-of the interface the probe packet is sent on.
-If the IP address
-is not one of this machine's interface addresses and the user is
-not the superuser, an error is returned and nothing is sent.
+.It Fl s Ar sourceaddr
+Set the source address to transmit from, which is useful on machines
+with multiple interfaces.
 .It Fl t Ar toskeyword
 Set the type-of-service (TOS) in probe packets.
 The value may be one of
diff --git a/usr.sbin/traceroute/traceroute.c b/usr.sbin/traceroute/traceroute.c
index d079e91b4f5..e1ae29c4f1d 100644
--- a/usr.sbin/traceroute/traceroute.c
+++ b/usr.sbin/traceroute/traceroute.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: traceroute.c,v 1.162 2019/08/28 20:03:51 deraadt Exp $	*/
+/*	$OpenBSD: traceroute.c,v 1.163 2020/02/11 18:41:39 deraadt Exp $	*/
 /*	$NetBSD: traceroute.c,v 1.10 1995/05/21 15:50:45 mycroft Exp $	*/
 
 /*
@@ -962,13 +962,13 @@ usage(int v6flag)
 	if (v6flag) {
 		fprintf(stderr, "usage: %s "
 		    "[-AcDdIlnSv] [-f first_hop] [-m max_hop] [-p port]\n"
-		    "\t[-q nqueries] [-s src_addr] [-t toskeyword] [-V rtable] "
+		    "\t[-q nqueries] [-s sourceaddr] [-t toskeyword] [-V rtable] "
 		    "[-w waittime]\n\thost [datalen]\n", __progname);
 	} else {
 		fprintf(stderr,
 		    "usage: %s [-AcDdIlnSvx] [-f first_ttl] [-g gateway_addr] "
 		    "[-m max_ttl]\n"
-		    "\t[-P proto] [-p port] [-q nqueries] [-s src_addr]\n"
+		    "\t[-P proto] [-p port] [-q nqueries] [-s sourceaddr]\n"
 		    "\t[-t toskeyword] "
 		    "[-V rtable] [-w waittime] host [datalen]\n",
 		    __progname);