Standardize argument naming for "sourceaddr" and unify the wording a bit,

similar to what deraadt@ recently did in other manual pages.

10 files changed, 45 insertions, 41 deletions

diff --git a/usr.bin/dig/dig.1 b/usr.bin/dig/dig.1
index 5687b30c02a..2d1fbf76e95 100644
--- a/usr.bin/dig/dig.1
+++ b/usr.bin/dig/dig.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: dig.1,v 1.2 2020/02/11 16:50:58 florian Exp $
+.\" $OpenBSD: dig.1,v 1.3 2020/02/12 14:46:36 schwarze Exp $
 .\"
 .\" Copyright (C) 2000-2011, 2013-2018 Internet Systems Consortium, Inc. ("ISC")
 .\"
@@ -14,7 +14,7 @@
 .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 .\" PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: February 11 2020 $
+.Dd $Mdocdate: February 12 2020 $
 .Dt DIG 1
 .Os
 .Sh NAME
@@ -24,7 +24,7 @@
 .Nm
 .Op Pf @ Ar server
 .Op Fl 46hiuv
-.Op Fl b Ar address Ns Op Pf # Ar port
+.Op Fl b Ar sourceaddr Ns Op Pf # Ar port
 .Op Fl c Ar class
 .Op Fl f Ar file
 .Op Fl k Ar keyfile
@@ -97,10 +97,11 @@ The options are as follows:
 Use IPv4 only.
 .It Fl 6
 Use IPv6 only.
-.It Fl b Ar address Ns Op Pf # Ar port
-Set the source IP address of the query.
+.It Fl b Ar sourceaddr Ns Op Pf # Ar port
+Set the source IP address of the query, which is useful on machines
+with multiple interfaces.
 The
-.Ar address
+.Ar sourceaddr
 must be a valid address on one of the host's network interfaces, or
 "0.0.0.0" or "::". An optional port may be specified by appending
 "#<port>".
diff --git a/usr.bin/dig/dig.c b/usr.bin/dig/dig.c
index 914f2988844..114c410791e 100644
--- a/usr.bin/dig/dig.c
+++ b/usr.bin/dig/dig.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dig.c,v 1.3 2020/02/11 23:26:11 jsg Exp $ */
+/* $Id: dig.c,v 1.4 2020/02/12 14:46:36 schwarze Exp $ */
 
 /*! \file */
 #include <sys/cdefs.h>
@@ -140,7 +140,7 @@ rcode_totext(dns_rcode_t rcode)
 static void
 print_usage(FILE *fp) {
 	fputs(
-"usage: dig [@server] [-46hiuv] [-b address[#port]] [-c class] [-f file]\n"
+"usage: dig [@server] [-46hiuv] [-b sourceaddr[#port]] [-c class] [-f file]\n"
 "           [-k keyfile] [-p port] [-q name] [-t type] [-x addr]\n"
 "           [-y [hmac:]name:key] [name] [type] [class]\n"
 "           +[no]aaonly +[no]additional +[no]adflag +[no]all +[no]answer\n"
diff --git a/usr.bin/nc/nc.1 b/usr.bin/nc/nc.1
index 746a0559443..fff5857229a 100644
--- a/usr.bin/nc/nc.1
+++ b/usr.bin/nc/nc.1
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: nc.1,v 1.94 2019/10/24 17:27:08 kn Exp $
+.\"     $OpenBSD: nc.1,v 1.95 2020/02/12 14:46:36 schwarze Exp $
 .\"
 .\" Copyright (c) 1996 David Sacerdote
 .\" All rights reserved.
@@ -25,7 +25,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: October 24 2019 $
+.Dd $Mdocdate: February 12 2020 $
 .Dt NC 1
 .Os
 .Sh NAME
@@ -47,7 +47,7 @@
 .Op Fl P Ar proxy_username
 .Op Fl p Ar source_port
 .Op Fl R Ar CAfile
-.Op Fl s Ar source
+.Op Fl s Ar sourceaddr
 .Op Fl T Ar keyword
 .Op Fl V Ar rtable
 .Op Fl W Ar recvlimit
@@ -228,10 +228,9 @@ instead of sequentially within a range or in the order that the system
 assigns them.
 .It Fl S
 Enable the RFC 2385 TCP MD5 signature option.
-.It Fl s Ar source
-Send packets from the interface with the
-.Ar source
-IP address.
+.It Fl s Ar sourceaddr
+Set the source address to send packets from,
+which is useful on machines with multiple interfaces.
 For
 .Ux Ns -domain
 datagram sockets, specifies the local temporary socket file
diff --git a/usr.bin/nc/netcat.c b/usr.bin/nc/netcat.c
index c4b524431bf..503095584ad 100644
--- a/usr.bin/nc/netcat.c
+++ b/usr.bin/nc/netcat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: netcat.c,v 1.216 2020/01/26 23:47:57 beck Exp $ */
+/* $OpenBSD: netcat.c,v 1.217 2020/02/12 14:46:36 schwarze Exp $ */
 /*
  * Copyright (c) 2001 Eric Jackson <ericj@monkey.org>
  * Copyright (c) 2015 Bob Beck.  All rights reserved.
@@ -1822,7 +1822,7 @@ help(void)
 	\t-R CAfile	CA bundle\n\
 	\t-r		Randomize remote ports\n\
 	\t-S		Enable the TCP MD5 signature option\n\
-	\t-s source	Local source address\n\
+	\t-s sourceaddr	Local source address\n\
 	\t-T keyword	TOS value or TLS options\n\
 	\t-t		Answer TELNET negotiation\n\
 	\t-U		Use UNIX domain socket\n\
@@ -1848,7 +1848,7 @@ usage(int ret)
 	    "\t  [-i interval] [-K keyfile] [-M ttl] [-m minttl] [-O length]\n"
 	    "\t  [-o staplefile] [-P proxy_username] [-p source_port] "
 	    "[-R CAfile]\n"
-	    "\t  [-s source] [-T keyword] [-V rtable] [-W recvlimit] "
+	    "\t  [-s sourceaddr] [-T keyword] [-V rtable] [-W recvlimit] "
 	    "[-w timeout]\n"
 	    "\t  [-X proxy_protocol] [-x proxy_address[:port]] "
 	    "[-Z peercertfile]\n"
diff --git a/usr.bin/tcpbench/tcpbench.1 b/usr.bin/tcpbench/tcpbench.1
index 3ada4b5b08b..daebe880544 100644
--- a/usr.bin/tcpbench/tcpbench.1
+++ b/usr.bin/tcpbench/tcpbench.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: tcpbench.1,v 1.25 2018/09/28 19:01:52 bluhm Exp $
+.\" $OpenBSD: tcpbench.1,v 1.26 2020/02/12 14:46:36 schwarze Exp $
 .\"
 .\" Copyright (c) 2008 Damien Miller <djm@mindrot.org>
 .\"
@@ -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: September 28 2018 $
+.Dd $Mdocdate: February 12 2020 $
 .Dt TCPBENCH 1
 .Os
 .Sh NAME
@@ -26,7 +26,7 @@
 .Nm
 .Op Fl 46RUuv
 .Op Fl B Ar buf
-.Op Fl b Ar addr
+.Op Fl b Ar sourceaddr
 .Op Fl k Ar kvars
 .Op Fl n Ar connections
 .Op Fl p Ar port
@@ -90,8 +90,9 @@ Specify the size of the internal read/write buffer used by
 The default is 262144 bytes for TCP client/server and UDP server.
 In UDP client mode this may be used to specify the packet size on the test
 stream.
-.It Fl b Ar addr
-Specify the IP address of the interface which is used to send the packets.
+.It Fl b Ar sourceaddr
+Specify the IP address to send the packets from,
+which is useful on machines with multiple interfaces.
 .It Fl k Ar kvars
 Specify one or more kernel variables to monitor; multiple variables must be
 separated with commas.
diff --git a/usr.bin/tcpbench/tcpbench.c b/usr.bin/tcpbench/tcpbench.c
index bda10f5a0ce..ae3c20d858d 100644
--- a/usr.bin/tcpbench/tcpbench.c
+++ b/usr.bin/tcpbench/tcpbench.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcpbench.c,v 1.60 2019/11/26 17:51:33 stsp Exp $	*/
+/*	$OpenBSD: tcpbench.c,v 1.61 2020/02/12 14:46:36 schwarze Exp $	*/
 
 /*
  * Copyright (c) 2008 Damien Miller <djm@mindrot.org>
@@ -185,7 +185,7 @@ usage(void)
 {
 	fprintf(stderr,
 	    "usage: tcpbench -l\n"
-	    "       tcpbench [-46RUuv] [-B buf] [-b addr] [-k kvars] [-n connections]\n"
+	    "       tcpbench [-46RUuv] [-B buf] [-b sourceaddr] [-k kvars] [-n connections]\n"
 	    "                [-p port] [-r interval] [-S space] [-T toskeyword]\n"
 	    "                [-t secs] [-V rtable] hostname\n"
 	    "       tcpbench -s [-46Uuv] [-B buf] [-k kvars] [-p port] [-r interval]\n"
diff --git a/usr.sbin/ftp-proxy/ftp-proxy.8 b/usr.sbin/ftp-proxy/ftp-proxy.8
index 32565fac5f7..5ea785ae855 100644
--- a/usr.sbin/ftp-proxy/ftp-proxy.8
+++ b/usr.sbin/ftp-proxy/ftp-proxy.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ftp-proxy.8,v 1.23 2017/01/15 06:16:05 deraadt Exp $
+.\"	$OpenBSD: ftp-proxy.8,v 1.24 2020/02/12 14:46:36 schwarze Exp $
 .\"
 .\" Copyright (c) 2004, 2005 Camiel Dobbelaar, <cd@sentia.nl>
 .\"
@@ -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 15 2017 $
+.Dd $Mdocdate: February 12 2020 $
 .Dt FTP-PROXY 8
 .Os
 .Sh NAME
@@ -24,7 +24,7 @@
 .Nm
 .Bk -words
 .Op Fl 6Adrv
-.Op Fl a Ar address
+.Op Fl a Ar sourceaddr
 .Op Fl b Ar address
 .Op Fl D Ar level
 .Op Fl m Ar maxsessions
@@ -94,9 +94,10 @@ The proxy is in IPv4 mode by default.
 .It Fl A
 Only permit anonymous FTP connections.
 Either user "ftp" or user "anonymous" is allowed.
-.It Fl a Ar address
+.It Fl a Ar sourceaddr
 The proxy will use this as the source address for the control
-connection to a server.
+connection to a server, which is useful on machines with multiple
+interfaces.
 .It Fl b Ar address
 Address where the proxy will listen for redirected control connections.
 The default is 127.0.0.1, or ::1 in IPv6 mode.
diff --git a/usr.sbin/ftp-proxy/ftp-proxy.c b/usr.sbin/ftp-proxy/ftp-proxy.c
index d986d27fd76..7b2c9fb3762 100644
--- a/usr.sbin/ftp-proxy/ftp-proxy.c
+++ b/usr.sbin/ftp-proxy/ftp-proxy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ftp-proxy.c,v 1.37 2019/06/28 13:32:47 deraadt Exp $ */
+/*	$OpenBSD: ftp-proxy.c,v 1.38 2020/02/12 14:46:36 schwarze Exp $ */
 
 /*
  * Copyright (c) 2004, 2005 Camiel Dobbelaar, <cd@sentia.nl>
@@ -1133,7 +1133,7 @@ sock_ntop(struct sockaddr *sa)
 void
 usage(void)
 {
-	fprintf(stderr, "usage: %s [-6Adrv] [-a address] [-b address]"
+	fprintf(stderr, "usage: %s [-6Adrv] [-a sourceaddr] [-b address]"
 	    " [-D level] [-m maxsessions]\n                 [-P port]"
 	    " [-p port] [-q queue] [-R address] [-T tag]\n"
             "                 [-t timeout]\n", __progname);
diff --git a/usr.sbin/ntpd/ntpd.conf.5 b/usr.sbin/ntpd/ntpd.conf.5
index 599542d359c..2a92c3ba10d 100644
--- a/usr.sbin/ntpd/ntpd.conf.5
+++ b/usr.sbin/ntpd/ntpd.conf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ntpd.conf.5,v 1.44 2020/02/10 13:18:21 schwarze Exp $
+.\" $OpenBSD: ntpd.conf.5,v 1.45 2020/02/12 14:46:36 schwarze Exp $
 .\"
 .\" Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
 .\"
@@ -14,7 +14,7 @@
 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
 .\" OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: February 10 2020 $
+.Dd $Mdocdate: February 12 2020 $
 .Dt NTPD.CONF 5
 .Os
 .Sh NAME
@@ -68,10 +68,11 @@ listen on 127.0.0.1
 listen on ::1
 listen on 127.0.0.1 rtable 4
 .Ed
-.It Ic query from Ar address
+.It Ic query from Ar sourceaddr
 Specify a local IP address the
 .Xr ntpd 8
-daemon should use for outgoing queries to subsequently specified servers.
+daemon should use for outgoing queries to subsequently specified servers,
+which is useful on machines with multiple interfaces.
 For example:
 .Bd -literal -offset indent
 query from 192.0.2.1
diff --git a/usr.sbin/smtpd/smtpd.conf.5 b/usr.sbin/smtpd/smtpd.conf.5
index 8f67e9170ae..11340310429 100644
--- a/usr.sbin/smtpd/smtpd.conf.5
+++ b/usr.sbin/smtpd/smtpd.conf.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: smtpd.conf.5,v 1.248 2020/01/08 10:02:17 jmc Exp $
+.\"	$OpenBSD: smtpd.conf.5,v 1.249 2020/02/12 14:46:36 schwarze Exp $
 .\"
 .\" Copyright (c) 2008 Janne Johansson <jj@openbsd.org>
 .\" Copyright (c) 2009 Jacek Masiulaniec <jacekm@dobremiasto.net>
@@ -17,7 +17,7 @@
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
 .\"
-.Dd $Mdocdate: January 8 2020 $
+.Dd $Mdocdate: February 12 2020 $
 .Dt SMTPD.CONF 5
 .Os
 .Sh NAME
@@ -299,10 +299,11 @@ The credential table format is described in
 Use
 .Ar mailaddr
 as the MAIL FROM address within the SMTP transaction.
-.It Cm src Ar address | Pf < Ar address Ns >
+.It Cm src Ar sourceaddr | Pf < Ar sourceaddr Ns >
 Use the string or list table
-.Ar address
-for the source IP address.
+.Ar sourceaddr
+for the source IP address,
+which is useful on machines with multiple interfaces.
 If the list contains more than one address, all of them are used
 in such a way that traffic is routed as efficiently as possible.
 .El