diff options
| -rw-r--r-- | libexec/ftp-proxy/ftp-proxy.8 | 16 | ||||
| -rw-r--r-- | libexec/ftp-proxy/ftp-proxy.c | 8 |
2 files changed, 13 insertions, 11 deletions
diff --git a/libexec/ftp-proxy/ftp-proxy.8 b/libexec/ftp-proxy/ftp-proxy.8 index 508dbb124e2..e1281360076 100644 --- a/libexec/ftp-proxy/ftp-proxy.8 +++ b/libexec/ftp-proxy/ftp-proxy.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ftp-proxy.8,v 1.41 2004/07/06 19:49:11 dhartmei Exp $ +.\" $OpenBSD: ftp-proxy.8,v 1.42 2004/11/19 00:47:23 jmc Exp $ .\" .\" Copyright (c) 1996-2001 .\" Obtuse Systems Corporation, All rights reserved. @@ -35,6 +35,7 @@ .Nd Internet File Transfer Protocol proxy server .Sh SYNOPSIS .Nm ftp-proxy +.Bk -words .Op Fl AnrVw .Op Fl a Ar address .Op Fl D Ar debuglevel @@ -45,6 +46,7 @@ .Op Fl S Ar address .Op Fl t Ar timeout .Op Fl u Ar user +.Ek .Sh DESCRIPTION .Nm is a proxy for the Internet File Transfer Protocol. @@ -139,12 +141,6 @@ Without this flag, does not require any IP forwarding or NAT beyond the .Em rdr necessary to capture the FTP control connection. -.It Fl r -Use reverse host -.Pq reverse DNS -lookups for logging and libwrap use. -By default, -the proxy does not look up hostnames for libwrap or logging purposes. .It Fl R Ar address:[port] Reverse proxy mode for FTP servers running behind a NAT gateway. In this mode, no redirection is needed. @@ -153,6 +149,12 @@ The proxy is run from on the port that external clients connect to (usually 21). Control connections and passive data connections are forwarded to the server. +.It Fl r +Use reverse host +.Pq reverse DNS +lookups for logging and libwrap use. +By default, +the proxy does not look up hostnames for libwrap or logging purposes. .It Fl S Ar address Source address to use for data connections made by the proxy. Useful when there are multiple addresses (aliases) available diff --git a/libexec/ftp-proxy/ftp-proxy.c b/libexec/ftp-proxy/ftp-proxy.c index def87071627..2a9913f9235 100644 --- a/libexec/ftp-proxy/ftp-proxy.c +++ b/libexec/ftp-proxy/ftp-proxy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ftp-proxy.c,v 1.37 2004/07/11 01:54:36 brad Exp $ */ +/* $OpenBSD: ftp-proxy.c,v 1.38 2004/11/19 00:47:23 jmc Exp $ */ /* * Copyright (c) 1996-2001 @@ -175,9 +175,9 @@ static void usage(void) { syslog(LOG_NOTICE, - "usage: %s [-AnrVw] [-a address] [-D debuglevel [-g group]" - " [-M maxport] [-m minport] [-t timeout] [-u user]" - " [-R address[:port]] [-S address]", __progname); + "usage: %s [-AnrVw] [-a address] [-D debuglevel] [-g group]" + " [-M maxport] [-m minport] [-R address[:port]] [-S address]" + " [-t timeout] [-u user]", __progname); exit(EX_USAGE); } |