- jmc@cvs.openbsd.org 2013/10/17 07:35:48

[sftp.1 sftp.c]
     tweak previous;
This commit is contained in:
Damien Miller 2013-10-18 10:17:17 +11:00
parent a176e18230
commit 1edcbf65eb
3 changed files with 7 additions and 4 deletions

View File

@ -3,6 +3,9 @@
- djm@cvs.openbsd.org 2013/10/09 23:44:14 - djm@cvs.openbsd.org 2013/10/09 23:44:14
[regress/Makefile regress/sftp-perm.sh] [regress/Makefile regress/sftp-perm.sh]
regression test for sftp request white/blacklisting and readonly mode. regression test for sftp request white/blacklisting and readonly mode.
- jmc@cvs.openbsd.org 2013/10/17 07:35:48
[sftp.1 sftp.c]
tweak previous;
20131017 20131017
- (djm) OpenBSD CVS Sync - (djm) OpenBSD CVS Sync

4
sftp.1
View File

@ -1,4 +1,4 @@
.\" $OpenBSD: sftp.1,v 1.95 2013/10/17 00:30:13 djm Exp $ .\" $OpenBSD: sftp.1,v 1.96 2013/10/17 07:35:48 jmc Exp $
.\" .\"
.\" Copyright (c) 2001 Damien Miller. All rights reserved. .\" Copyright (c) 2001 Damien Miller. All rights reserved.
.\" .\"
@ -384,7 +384,7 @@ If the
.Fl f .Fl f
flag is specified, then flag is specified, then
.Xr fsync 2 .Xr fsync 2
will ba called after the file transfer has completed to flush the file will be called after the file transfer has completed to flush the file
to disk. to disk.
.Pp .Pp
If either the If either the

4
sftp.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: sftp.c,v 1.156 2013/10/17 00:30:13 djm Exp $ */ /* $OpenBSD: sftp.c,v 1.157 2013/10/17 07:35:48 jmc Exp $ */
/* /*
* Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
* *
@ -2195,7 +2195,7 @@ usage(void)
extern char *__progname; extern char *__progname;
fprintf(stderr, fprintf(stderr,
"usage: %s [-1246aCpqrv] [-B buffer_size] [-b batchfile] [-c cipher]\n" "usage: %s [-1246aCfpqrv] [-B buffer_size] [-b batchfile] [-c cipher]\n"
" [-D sftp_server_path] [-F ssh_config] " " [-D sftp_server_path] [-F ssh_config] "
"[-i identity_file] [-l limit]\n" "[-i identity_file] [-l limit]\n"
" [-o ssh_option] [-P port] [-R num_requests] " " [-o ssh_option] [-P port] [-R num_requests] "