summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--sftp.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index b3338dcb7..1dc4f82e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -54,6 +54,9 @@
54 54
55 add a bandwidth limit option to sftp(1) using the above 55 add a bandwidth limit option to sftp(1) using the above
56 "very nice" markus@ 56 "very nice" markus@
57 - jmc@cvs.openbsd.org 2010/09/23 13:34:43
58 [sftp.c]
59 add [-l limit] to usage();
57 60
5820100910 6120100910
59 - (dtucker) [openbsd-compat/port-linux.c] Check is_selinux_enabled for exact 62 - (dtucker) [openbsd-compat/port-linux.c] Check is_selinux_enabled for exact
diff --git a/sftp.c b/sftp.c
index 8ce7d91fb..f6cadd113 100644
--- a/sftp.c
+++ b/sftp.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sftp.c,v 1.126 2010/09/22 22:58:51 djm Exp $ */ 1/* $OpenBSD: sftp.c,v 1.127 2010/09/23 13:34:43 jmc Exp $ */
2/* 2/*
3 * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> 3 * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
4 * 4 *
@@ -2054,7 +2054,7 @@ usage(void)
2054 fprintf(stderr, 2054 fprintf(stderr,
2055 "usage: %s [-1246Cpqrv] [-B buffer_size] [-b batchfile] [-c cipher]\n" 2055 "usage: %s [-1246Cpqrv] [-B buffer_size] [-b batchfile] [-c cipher]\n"
2056 " [-D sftp_server_path] [-F ssh_config] " 2056 " [-D sftp_server_path] [-F ssh_config] "
2057 "[-i identity_file]\n" 2057 "[-i identity_file] [-l limit]\n"
2058 " [-o ssh_option] [-P port] [-R num_requests] " 2058 " [-o ssh_option] [-P port] [-R num_requests] "
2059 "[-S program]\n" 2059 "[-S program]\n"
2060 " [-s subsystem | sftp_server] host\n" 2060 " [-s subsystem | sftp_server] host\n"