From c07138e6f6a9173d0315cceb123e3bc4abbd1528 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Wed, 7 Oct 2009 08:23:44 +1100 Subject: - jmc@cvs.openbsd.org 2009/08/13 13:39:54 [sftp.1 sftp.c] sync synopsis and usage(); --- ChangeLog | 3 +++ sftp.1 | 4 ++-- sftp.c | 8 +++++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 46f5e9cfa..9afa9e820 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,9 @@ used by our regression scripts. part of larger patch from carlosvsilvapt@gmail.com for his Google Summer of Code work; ok deraadt markus + - jmc@cvs.openbsd.org 2009/08/13 13:39:54 + [sftp.1 sftp.c] + sync synopsis and usage(); 20091002 - (djm) [Makefile.in] Mention readconf.o in ssh-keysign's make deps. diff --git a/sftp.1 b/sftp.1 index 6cec52ae1..fcd1d240a 100644 --- a/sftp.1 +++ b/sftp.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: sftp.1,v 1.72 2009/08/13 01:11:19 djm Exp $ +.\" $OpenBSD: sftp.1,v 1.73 2009/08/13 13:39:54 jmc Exp $ .\" .\" Copyright (c) 2001 Damien Miller. All rights reserved. .\" @@ -37,7 +37,7 @@ .Op Fl c Ar cipher .Op Fl D Ar sftp_server_path .Op Fl F Ar ssh_config -.Op Fl i Ar identity_path +.Op Fl i Ar identity_file .Op Fl o Ar ssh_option .Op Fl P Ar port .Op Fl R Ar num_requests diff --git a/sftp.c b/sftp.c index 4c1d55389..0123fd72c 100644 --- a/sftp.c +++ b/sftp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sftp.c,v 1.109 2009/08/13 01:11:19 djm Exp $ */ +/* $OpenBSD: sftp.c,v 1.110 2009/08/13 13:39:54 jmc Exp $ */ /* * Copyright (c) 2001-2004 Damien Miller * @@ -1669,8 +1669,10 @@ usage(void) fprintf(stderr, "usage: %s [-1246Cqv] [-B buffer_size] [-b batchfile] [-c cipher]\n" - " [-F ssh_config] [-i identify_file] [-o ssh_option]\n" - " [-P sftp_server_path] [-R num_requests] [-S program]\n" + " [-D sftp_server_path] [-F ssh_config] " + "[-i identity_file]\n" + " [-o ssh_option] [-P port] [-R num_requests] " + "[-S program]\n" " [-s subsystem | sftp_server] host\n" " %s [user@]host[:file ...]\n" " %s [user@]host[:dir[/]]\n" -- cgit v1.2.3