diff options
author | Damien Miller <djm@mindrot.org> | 2000-09-05 13:34:53 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2000-09-05 13:34:53 +1100 |
commit | 7b28dc5eb0b4d766ddbf5c1955de7e4edbe50e7c (patch) | |
tree | a3f8409e421134c543a49851c5cfd9d62a0455d5 /scp.1 | |
parent | 123cbe8e86b1f6e4c4dc016e76dcac1616971089 (diff) |
20000905
- (djm) Import OpenBSD CVS changes
- markus@cvs.openbsd.org 2000/08/31 15:52:24
[Makefile sshd.8 sshd_config sftp-server.8 sftp-server.c]
implement a SFTP server. interops with sftp2, scp2 and the windows
client from ssh.com
- markus@cvs.openbsd.org 2000/08/31 15:56:03
[README.openssh2]
sync
- markus@cvs.openbsd.org 2000/08/31 16:05:42
[session.c]
Wall
- markus@cvs.openbsd.org 2000/08/31 16:09:34
[authfd.c ssh-agent.c]
add a flag to SSH2_AGENTC_SIGN_REQUEST for future extensions
- deraadt@cvs.openbsd.org 2000/09/01 09:25:13
[scp.1 scp.c]
cleanup and fix -S support; stevesk@sweden.hp.com
- markus@cvs.openbsd.org 2000/09/01 16:29:32
[sftp-server.c]
portability fixes
- markus@cvs.openbsd.org 2000/09/01 16:32:41
[sftp-server.c]
fix cast; mouring@pconline.com
- itojun@cvs.openbsd.org 2000/09/03 09:23:28
[ssh-add.1 ssh.1]
add missing .El against .Bl.
- markus@cvs.openbsd.org 2000/09/04 13:03:41
[session.c]
missing close; ok theo
- markus@cvs.openbsd.org 2000/09/04 13:07:21
[session.c]
fix get_last_login_time order; from andre@van-veen.de
- markus@cvs.openbsd.org 2000/09/04 13:10:09
[sftp-server.c]
more cast fixes; from mouring@pconline.com
- markus@cvs.openbsd.org 2000/09/04 13:06:04
[session.c]
set SSH_ORIGINAL_COMMAND; from Leakin@dfw.nostrum.com, bet@rahul.net
- (djm) Cleanup after import. Fix sftp-server compilation, Makefile
Diffstat (limited to 'scp.1')
-rw-r--r-- | scp.1 | 15 |
1 files changed, 6 insertions, 9 deletions
@@ -9,7 +9,7 @@ | |||
9 | .\" | 9 | .\" |
10 | .\" Created: Sun May 7 00:14:37 1995 ylo | 10 | .\" Created: Sun May 7 00:14:37 1995 ylo |
11 | .\" | 11 | .\" |
12 | .\" $Id: scp.1,v 1.9 2000/08/23 00:46:24 djm Exp $ | 12 | .\" $Id: scp.1,v 1.10 2000/09/05 02:34:54 djm Exp $ |
13 | .\" | 13 | .\" |
14 | .Dd September 25, 1999 | 14 | .Dd September 25, 1999 |
15 | .Dt SCP 1 | 15 | .Dt SCP 1 |
@@ -20,6 +20,7 @@ | |||
20 | .Sh SYNOPSIS | 20 | .Sh SYNOPSIS |
21 | .Nm scp | 21 | .Nm scp |
22 | .Op Fl pqrvC46 | 22 | .Op Fl pqrvC46 |
23 | .Op Fl S Ar program | ||
23 | .Op Fl P Ar port | 24 | .Op Fl P Ar port |
24 | .Op Fl c Ar cipher | 25 | .Op Fl c Ar cipher |
25 | .Op Fl i Ar identity_file | 26 | .Op Fl i Ar identity_file |
@@ -68,11 +69,6 @@ This option is directly passed to | |||
68 | .It Fl p | 69 | .It Fl p |
69 | Preserves modification times, access times, and modes from the | 70 | Preserves modification times, access times, and modes from the |
70 | original file. | 71 | original file. |
71 | .It Fl S | ||
72 | Name of program to use for the encrypted connection. | ||
73 | The program must understand | ||
74 | .Xr ssh 1 | ||
75 | options. | ||
76 | .It Fl r | 72 | .It Fl r |
77 | Recursively copy entire directories. | 73 | Recursively copy entire directories. |
78 | .It Fl v | 74 | .It Fl v |
@@ -103,9 +99,10 @@ because | |||
103 | .Fl p | 99 | .Fl p |
104 | is already reserved for preserving the times and modes of the file in | 100 | is already reserved for preserving the times and modes of the file in |
105 | .Xr rcp 1 . | 101 | .Xr rcp 1 . |
106 | .It Fl S | 102 | .It Fl S Ar program |
107 | Name of program to use for the encrypted connection. The program must | 103 | Name of |
108 | understand | 104 | .Ar program |
105 | to use for the encrypted connection. The program must understand | ||
109 | .Xr ssh 1 | 106 | .Xr ssh 1 |
110 | options. | 107 | options. |
111 | .It Fl 4 | 108 | .It Fl 4 |