summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--sftp.c7
2 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 14a9db1ce..f91cbe950 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,9 @@
[packet.c]
the 2^(blocksize*2) rekeying limit is too expensive for 3DES,
blowfish, etc, so enforce a 1GB limit for small blocksizes.
+ - markus@cvs.openbsd.org 2003/07/10 20:05:55
+ [sftp.c]
+ sync usage with manpage, add missing -R
20030708
- (dtucker) [acconfig.h auth-passwd.c configure.ac session.c port-aix.[ch]]
@@ -690,4 +693,4 @@
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au
-$Id: ChangeLog,v 1.2855 2003/07/14 07:31:06 dtucker Exp $
+$Id: ChangeLog,v 1.2856 2003/07/14 07:32:29 dtucker Exp $
diff --git a/sftp.c b/sftp.c
index fe65b972c..4354bfd44 100644
--- a/sftp.c
+++ b/sftp.c
@@ -24,7 +24,7 @@
#include "includes.h"
-RCSID("$OpenBSD: sftp.c,v 1.36 2003/06/04 12:41:22 djm Exp $");
+RCSID("$OpenBSD: sftp.c,v 1.37 2003/07/10 20:05:55 markus Exp $");
#include "buffer.h"
#include "xmalloc.h"
@@ -112,8 +112,9 @@ usage(void)
extern char *__progname;
fprintf(stderr,
- "usage: %s [-vC1] [-b batchfile] [-o option] [-s subsystem|path] [-B buffer_size]\n"
- " [-F config] [-P direct server path] [-S program]\n"
+ "usage: %s [-vC1] [-b batchfile] [-o ssh_option] [-s subsystem | sftp_server]\n"
+ " [-B buffer_size] [-F ssh_config] [-P sftp_server path]\n"
+ " [-R num_requests] [-S program]\n"
" [user@]host[:file [file]]\n", __progname);
exit(1);
}