diff options
author | Damien Miller <djm@mindrot.org> | 2013-10-18 10:17:17 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2013-10-18 10:17:17 +1100 |
commit | 1edcbf65ebd2febeaf10a836468f35e519eed7ca (patch) | |
tree | e241f20eb85ad09f808f98fb8821aecb84d640c2 | |
parent | a176e1823013dd8533a20235b3a5131f0626f46b (diff) |
- jmc@cvs.openbsd.org 2013/10/17 07:35:48
[sftp.1 sftp.c]
tweak previous;
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | sftp.1 | 4 | ||||
-rw-r--r-- | sftp.c | 4 |
3 files changed, 7 insertions, 4 deletions
@@ -3,6 +3,9 @@ | |||
3 | - djm@cvs.openbsd.org 2013/10/09 23:44:14 | 3 | - djm@cvs.openbsd.org 2013/10/09 23:44:14 |
4 | [regress/Makefile regress/sftp-perm.sh] | 4 | [regress/Makefile regress/sftp-perm.sh] |
5 | regression test for sftp request white/blacklisting and readonly mode. | 5 | regression test for sftp request white/blacklisting and readonly mode. |
6 | - jmc@cvs.openbsd.org 2013/10/17 07:35:48 | ||
7 | [sftp.1 sftp.c] | ||
8 | tweak previous; | ||
6 | 9 | ||
7 | 20131017 | 10 | 20131017 |
8 | - (djm) OpenBSD CVS Sync | 11 | - (djm) OpenBSD CVS Sync |
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: sftp.1,v 1.95 2013/10/17 00:30:13 djm Exp $ | 1 | .\" $OpenBSD: sftp.1,v 1.96 2013/10/17 07:35:48 jmc Exp $ |
2 | .\" | 2 | .\" |
3 | .\" Copyright (c) 2001 Damien Miller. All rights reserved. | 3 | .\" Copyright (c) 2001 Damien Miller. All rights reserved. |
4 | .\" | 4 | .\" |
@@ -384,7 +384,7 @@ If the | |||
384 | .Fl f | 384 | .Fl f |
385 | flag is specified, then | 385 | flag is specified, then |
386 | .Xr fsync 2 | 386 | .Xr fsync 2 |
387 | will ba called after the file transfer has completed to flush the file | 387 | will be called after the file transfer has completed to flush the file |
388 | to disk. | 388 | to disk. |
389 | .Pp | 389 | .Pp |
390 | If either the | 390 | If either the |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sftp.c,v 1.156 2013/10/17 00:30:13 djm Exp $ */ | 1 | /* $OpenBSD: sftp.c,v 1.157 2013/10/17 07:35:48 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 | * |
@@ -2195,7 +2195,7 @@ usage(void) | |||
2195 | extern char *__progname; | 2195 | extern char *__progname; |
2196 | 2196 | ||
2197 | fprintf(stderr, | 2197 | fprintf(stderr, |
2198 | "usage: %s [-1246aCpqrv] [-B buffer_size] [-b batchfile] [-c cipher]\n" | 2198 | "usage: %s [-1246aCfpqrv] [-B buffer_size] [-b batchfile] [-c cipher]\n" |
2199 | " [-D sftp_server_path] [-F ssh_config] " | 2199 | " [-D sftp_server_path] [-F ssh_config] " |
2200 | "[-i identity_file] [-l limit]\n" | 2200 | "[-i identity_file] [-l limit]\n" |
2201 | " [-o ssh_option] [-P port] [-R num_requests] " | 2201 | " [-o ssh_option] [-P port] [-R num_requests] " |