diff options
| author |   schwarze <schwarze@openbsd.org> | 2020-02-12 14:46:36 +0000 |
|---|---|---|
| committer | schwarze <schwarze@openbsd.org> | 2020-02-12 14:46:36 +0000 |
| commit | 65e34726da66cef7bedf05e46505fb9773838ea0 (patch) | |
| tree | d619fe25563cef16b4ebb7fe667cca344c1c86b9 /usr.sbin/ftp-proxy | |
| parent | Do not reparent a traced child to ourself inside wait(2). (diff) | |
| download | wireguard-openbsd-65e34726da66cef7bedf05e46505fb9773838ea0.tar.xz wireguard-openbsd-65e34726da66cef7bedf05e46505fb9773838ea0.zip | |
Standardize argument naming for "sourceaddr" and unify the wording a bit,
similar to what deraadt@ recently did in other manual pages.
Diffstat (limited to 'usr.sbin/ftp-proxy')
| -rw-r--r-- | usr.sbin/ftp-proxy/ftp-proxy.8 | 11 | ||||
| -rw-r--r-- | usr.sbin/ftp-proxy/ftp-proxy.c | 4 |
2 files changed, 8 insertions, 7 deletions
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); |