diff options
author | Darren Tucker <dtucker@zip.com.au> | 2009-10-07 08:23:06 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2009-10-07 08:23:06 +1100 |
commit | 282b4026cb5c5a229e2c5b33e4ad3ac31fcf3189 (patch) | |
tree | 182d38eb23823330e04099e81bc2c57f4eac309e /sftp.1 | |
parent | adba1ba51474d43e708de2b986c36199fa8f167e (diff) |
- djm@cvs.openbsd.org 2009/08/13 01:11:19
[sftp.1 sftp.c]
Swizzle options: "-P sftp_server_path" moves to "-D sftp_server_path",
add "-P port" to match scp(1). Fortunately, the -P option is only really
used by our regression scripts.
part of larger patch from carlosvsilvapt@gmail.com for his Google Summer
of Code work; ok deraadt markus
Diffstat (limited to 'sftp.1')
-rw-r--r-- | sftp.1 | 19 |
1 files changed, 11 insertions, 8 deletions
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: sftp.1,v 1.71 2009/08/12 06:31:42 jmc Exp $ | 1 | .\" $OpenBSD: sftp.1,v 1.72 2009/08/13 01:11:19 djm Exp $ |
2 | .\" | 2 | .\" |
3 | .\" Copyright (c) 2001 Damien Miller. All rights reserved. | 3 | .\" Copyright (c) 2001 Damien Miller. All rights reserved. |
4 | .\" | 4 | .\" |
@@ -22,7 +22,7 @@ | |||
22 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 22 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
23 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
24 | .\" | 24 | .\" |
25 | .Dd $Mdocdate: August 12 2009 $ | 25 | .Dd $Mdocdate: August 13 2009 $ |
26 | .Dt SFTP 1 | 26 | .Dt SFTP 1 |
27 | .Os | 27 | .Os |
28 | .Sh NAME | 28 | .Sh NAME |
@@ -35,10 +35,11 @@ | |||
35 | .Op Fl B Ar buffer_size | 35 | .Op Fl B Ar buffer_size |
36 | .Op Fl b Ar batchfile | 36 | .Op Fl b Ar batchfile |
37 | .Op Fl c Ar cipher | 37 | .Op Fl c Ar cipher |
38 | .Op Fl D Ar sftp_server_path | ||
38 | .Op Fl F Ar ssh_config | 39 | .Op Fl F Ar ssh_config |
39 | .Op Fl i Ar identity_path | 40 | .Op Fl i Ar identity_path |
40 | .Op Fl o Ar ssh_option | 41 | .Op Fl o Ar ssh_option |
41 | .Op Fl P Ar sftp_server_path | 42 | .Op Fl P Ar port |
42 | .Op Fl R Ar num_requests | 43 | .Op Fl R Ar num_requests |
43 | .Op Fl S Ar program | 44 | .Op Fl S Ar program |
44 | .Op Fl s Ar subsystem | sftp_server | 45 | .Op Fl s Ar subsystem | sftp_server |
@@ -140,6 +141,11 @@ flag). | |||
140 | Selects the cipher to use for encrypting the data transfers. | 141 | Selects the cipher to use for encrypting the data transfers. |
141 | This option is directly passed to | 142 | This option is directly passed to |
142 | .Xr ssh 1 . | 143 | .Xr ssh 1 . |
144 | .It Fl D Ar sftp_server_path | ||
145 | Connect directly to a local sftp server | ||
146 | (rather than via | ||
147 | .Xr ssh 1 ) . | ||
148 | This option may be useful in debugging the client and server. | ||
143 | .It Fl F Ar ssh_config | 149 | .It Fl F Ar ssh_config |
144 | Specifies an alternative | 150 | Specifies an alternative |
145 | per-user configuration file for | 151 | per-user configuration file for |
@@ -215,11 +221,8 @@ For full details of the options listed below, and their possible values, see | |||
215 | .It UserKnownHostsFile | 221 | .It UserKnownHostsFile |
216 | .It VerifyHostKeyDNS | 222 | .It VerifyHostKeyDNS |
217 | .El | 223 | .El |
218 | .It Fl P Ar sftp_server_path | 224 | .It Fl P Ar port |
219 | Connect directly to a local sftp server | 225 | Specifies the port to connect to on the remote host. |
220 | (rather than via | ||
221 | .Xr ssh 1 ) . | ||
222 | This option may be useful in debugging the client and server. | ||
223 | .It Fl q | 226 | .It Fl q |
224 | Quiet mode: disables the progress meter as well as warning and | 227 | Quiet mode: disables the progress meter as well as warning and |
225 | diagnostic messages from | 228 | diagnostic messages from |