summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--sftp.131
-rw-r--r--sftp.c6
3 files changed, 31 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 53e9808bc..199c4e356 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,9 @@
20 never keep a connection to the smartcard open. 20 never keep a connection to the smartcard open.
21 allows ssh-keygen -D U while the agent is running; report from 21 allows ssh-keygen -D U while the agent is running; report from
22 jakob@ 22 jakob@
23 - stevesk@cvs.openbsd.org 2001/09/17 20:38:09
24 [sftp.1 sftp.c]
25 cleanup and document -1, -s and -S; ok markus@
23 26
2420010917 2720010917
25 - (djm) x11-ssh-askpass-1.2.4 in RPM spec, revert workarounds 28 - (djm) x11-ssh-askpass-1.2.4 in RPM spec, revert workarounds
@@ -6480,4 +6483,4 @@
6480 - Wrote replacements for strlcpy and mkdtemp 6483 - Wrote replacements for strlcpy and mkdtemp
6481 - Released 1.0pre1 6484 - Released 1.0pre1
6482 6485
6483$Id: ChangeLog,v 1.1534 2001/09/18 05:45:44 mouring Exp $ 6486$Id: ChangeLog,v 1.1535 2001/09/18 05:47:32 mouring Exp $
diff --git a/sftp.1 b/sftp.1
index 120e16897..0cc4e2b63 100644
--- a/sftp.1
+++ b/sftp.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: sftp.1,v 1.25 2001/09/17 17:57:57 stevesk Exp $ 1.\" $OpenBSD: sftp.1,v 1.26 2001/09/17 20:38:09 stevesk Exp $
2.\" 2.\"
3.\" Copyright (c) 2001 Damien Miller. All rights reserved. 3.\" Copyright (c) 2001 Damien Miller. All rights reserved.
4.\" 4.\"
@@ -30,11 +30,13 @@
30.Nd Secure file transfer program 30.Nd Secure file transfer program
31.Sh SYNOPSIS 31.Sh SYNOPSIS
32.Nm sftp 32.Nm sftp
33.Op Fl vC 33.Op Fl 1Cv
34.Op Fl b Ar batchfile 34.Op Fl b Ar batchfile
35.Op Fl F Ar ssh_config 35.Op Fl F Ar ssh_config
36.Op Fl o Ar ssh_option 36.Op Fl o Ar ssh_option
37.Op Ar host 37.Op Fl s Ar subsystem | sftp_server
38.Op Fl S Ar program
39.Ar host
38.Nm sftp 40.Nm sftp
39.Op [\fIuser\fR@]\fIhost\fR[:\fIfile\fR [\fIfile\fR]] 41.Op [\fIuser\fR@]\fIhost\fR[:\fIfile\fR [\fIfile\fR]]
40.Nm sftp 42.Nm sftp
@@ -61,6 +63,8 @@ The last usage format allows the sftp client to start in a remote directory.
61.Pp 63.Pp
62The options are as follows: 64The options are as follows:
63.Bl -tag -width Ds 65.Bl -tag -width Ds
66.It Fl 1
67Specify the use of protocol version 1.
64.It Fl b Ar batchfile 68.It Fl b Ar batchfile
65Batch mode reads a series of commands from an input 69Batch mode reads a series of commands from an input
66.Ar batchfile 70.Ar batchfile
@@ -77,7 +81,7 @@ and
77.It Fl C 81.It Fl C
78Enables compression (via ssh's 82Enables compression (via ssh's
79.Fl C 83.Fl C
80flag) 84flag).
81.It Fl F Ar ssh_config 85.It Fl F Ar ssh_config
82Specifies an alternative 86Specifies an alternative
83per-user configuration file for 87per-user configuration file for
@@ -92,9 +96,22 @@ in the format used in the
92configuration file. This is useful for specifying options 96configuration file. This is useful for specifying options
93for which there is no separate 97for which there is no separate
94.Nm sftp 98.Nm sftp
95command-line flag. For example, forcing the use of protocol 99command-line flag. For example, to specify an alternate
96version 1 is specified using 100port use:
97.Ic sftp -oProtocol=1 . 101.Ic sftp -oPort=24 .
102.It Fl s Ar subsystem | sftp_server
103Specifies the SSH2 subsystem or the path for an sftp server
104on the remote host. A path is useful for using sftp over
105protocol version 1, or when the remote
106.Nm sshd
107does not have an sftp subsystem configured.
108.It Fl S Ar program
109Name of the
110.Ar program
111to use for the encrypted connection.
112The program must understand
113.Xr ssh 1
114options.
98.It Fl v 115.It Fl v
99Raise logging level. This option is also passed to ssh. 116Raise logging level. This option is also passed to ssh.
100.El 117.El
diff --git a/sftp.c b/sftp.c
index b9558efd7..519ee6969 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.19 2001/09/17 17:57:57 stevesk Exp $"); 27RCSID("$OpenBSD: sftp.c,v 1.20 2001/09/17 20:38:09 stevesk Exp $");
28 28
29/* XXX: commandline mode */ 29/* XXX: commandline mode */
30/* XXX: short-form remote directory listings (like 'ls -C') */ 30/* XXX: short-form remote directory listings (like 'ls -C') */
@@ -94,8 +94,8 @@ static void
94usage(void) 94usage(void)
95{ 95{
96 fprintf(stderr, 96 fprintf(stderr,
97 "usage: sftp [-1vC] [-b batchfile] [-F config] [-o option]\n" 97 "usage: sftp [-1Cv] [-b batchfile] [-F config] [-o option] [-s subsystem|path]\n"
98 " [user@]host[:file [file]]\n"); 98 " [-S program] [user@]host[:file [file]]\n");
99 exit(1); 99 exit(1);
100} 100}
101 101