summaryrefslogtreecommitdiff
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 @@
17 [packet.c] 17 [packet.c]
18 the 2^(blocksize*2) rekeying limit is too expensive for 3DES, 18 the 2^(blocksize*2) rekeying limit is too expensive for 3DES,
19 blowfish, etc, so enforce a 1GB limit for small blocksizes. 19 blowfish, etc, so enforce a 1GB limit for small blocksizes.
20 - markus@cvs.openbsd.org 2003/07/10 20:05:55
21 [sftp.c]
22 sync usage with manpage, add missing -R
20 23
2120030708 2420030708
22 - (dtucker) [acconfig.h auth-passwd.c configure.ac session.c port-aix.[ch]] 25 - (dtucker) [acconfig.h auth-passwd.c configure.ac session.c port-aix.[ch]]
@@ -690,4 +693,4 @@
690 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. 693 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
691 Report from murple@murple.net, diagnosis from dtucker@zip.com.au 694 Report from murple@murple.net, diagnosis from dtucker@zip.com.au
692 695
693$Id: ChangeLog,v 1.2855 2003/07/14 07:31:06 dtucker Exp $ 696$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 @@
24 24
25#include "includes.h" 25#include "includes.h"
26 26
27RCSID("$OpenBSD: sftp.c,v 1.36 2003/06/04 12:41:22 djm Exp $"); 27RCSID("$OpenBSD: sftp.c,v 1.37 2003/07/10 20:05:55 markus Exp $");
28 28
29#include "buffer.h" 29#include "buffer.h"
30#include "xmalloc.h" 30#include "xmalloc.h"
@@ -112,8 +112,9 @@ usage(void)
112 extern char *__progname; 112 extern char *__progname;
113 113
114 fprintf(stderr, 114 fprintf(stderr,
115 "usage: %s [-vC1] [-b batchfile] [-o option] [-s subsystem|path] [-B buffer_size]\n" 115 "usage: %s [-vC1] [-b batchfile] [-o ssh_option] [-s subsystem | sftp_server]\n"
116 " [-F config] [-P direct server path] [-S program]\n" 116 " [-B buffer_size] [-F ssh_config] [-P sftp_server path]\n"
117 " [-R num_requests] [-S program]\n"
117 " [user@]host[:file [file]]\n", __progname); 118 " [user@]host[:file [file]]\n", __progname);
118 exit(1); 119 exit(1);
119} 120}