diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2017-05-02 08:54:20 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2017-05-02 08:54:20 +0000 |
| commit | f2f5700869aecee842543b40b46ff43ccfa540b1 (patch) | |
| tree | 884e245225780579c342937920e0ea8a8d2c2704 /usr.bin | |
| parent | 6a77885472431ece0f426cc7d8252121963e0cc2 (diff) | |
remove -1 / -2 options; pointed out by jmc@
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/ssh/sftp.1 | 10 | ||||
| -rw-r--r-- | usr.bin/ssh/sftp.c | 4 |
2 files changed, 5 insertions, 9 deletions
diff --git a/usr.bin/ssh/sftp.1 b/usr.bin/ssh/sftp.1 index fbdd00a1efd..05e008c5284 100644 --- a/usr.bin/ssh/sftp.1 +++ b/usr.bin/ssh/sftp.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: sftp.1,v 1.105 2016/07/16 06:57:55 jmc Exp $ +.\" $OpenBSD: sftp.1,v 1.106 2017/05/02 08:54:19 djm Exp $ .\" .\" Copyright (c) 2001 Damien Miller. All rights reserved. .\" @@ -22,7 +22,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: July 16 2016 $ +.Dd $Mdocdate: May 2 2017 $ .Dt SFTP 1 .Os .Sh NAME @@ -31,7 +31,7 @@ .Sh SYNOPSIS .Nm sftp .Bk -words -.Op Fl 1246aCfpqrv +.Op Fl 46aCfpqrv .Op Fl B Ar buffer_size .Op Fl b Ar batchfile .Op Fl c Ar cipher @@ -95,10 +95,6 @@ names, IPv6 addresses must be enclosed in square brackets to avoid ambiguity. .Pp The options are as follows: .Bl -tag -width Ds -.It Fl 1 -Specify the use of protocol version 1. -.It Fl 2 -Specify the use of protocol version 2. .It Fl 4 Forces .Nm diff --git a/usr.bin/ssh/sftp.c b/usr.bin/ssh/sftp.c index cec82acebe9..c74f252fd7c 100644 --- a/usr.bin/ssh/sftp.c +++ b/usr.bin/ssh/sftp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sftp.c,v 1.178 2017/02/15 01:46:47 djm Exp $ */ +/* $OpenBSD: sftp.c,v 1.179 2017/05/02 08:54:19 djm Exp $ */ /* * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> * @@ -2204,7 +2204,7 @@ usage(void) extern char *__progname; fprintf(stderr, - "usage: %s [-1246aCfpqrv] [-B buffer_size] [-b batchfile] [-c cipher]\n" + "usage: %s [-46aCfpqrv] [-B buffer_size] [-b batchfile] [-c cipher]\n" " [-D sftp_server_path] [-F ssh_config] " "[-i identity_file] [-l limit]\n" " [-o ssh_option] [-P port] [-R num_requests] " |