summaryrefslogtreecommitdiff
path: root/scp.0
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2011-01-24 12:43:25 +0000
committerColin Watson <cjwatson@debian.org>2011-01-24 12:43:25 +0000
commit626f1d986ff72aa514da63e34744e1de9cf21b9a (patch)
treed215a5280bc2e57251e4a9e08bfd3674ad824a94 /scp.0
parent6ed622cb6fe8f71bbe0d998cdd12280410bfb420 (diff)
parent0970072c89b079b022538e3c366fbfa2c53fc821 (diff)
* New upstream release (http://www.openssh.org/txt/release-5.7):
- Implement Elliptic Curve Cryptography modes for key exchange (ECDH) and host/user keys (ECDSA) as specified by RFC5656. ECDH and ECDSA offer better performance than plain DH and DSA at the same equivalent symmetric key length, as well as much shorter keys. - sftp(1)/sftp-server(8): add a protocol extension to support a hard link operation. It is available through the "ln" command in the client. The old "ln" behaviour of creating a symlink is available using its "-s" option or through the preexisting "symlink" command. - scp(1): Add a new -3 option to scp: Copies between two remote hosts are transferred through the local host (closes: #508613). - ssh(1): "atomically" create the listening mux socket by binding it on a temporary name and then linking it into position after listen() has succeeded. This allows the mux clients to determine that the server socket is either ready or stale without races (closes: #454784). Stale server sockets are now automatically removed (closes: #523250). - ssh(1): install a SIGCHLD handler to reap expired child process (closes: #594687). - ssh(1)/ssh-agent(1): honour $TMPDIR for client xauth and ssh-agent temporary directories (closes: #357469, although only if you arrange for ssh-agent to actually see $TMPDIR since the setgid bit will cause it to be stripped off).
Diffstat (limited to 'scp.0')
-rw-r--r--scp.012
1 files changed, 10 insertions, 2 deletions
diff --git a/scp.0 b/scp.0
index f5af8ccd5..f00631626 100644
--- a/scp.0
+++ b/scp.0
@@ -4,7 +4,7 @@ NAME
4 scp - secure copy (remote file copy program) 4 scp - secure copy (remote file copy program)
5 5
6SYNOPSIS 6SYNOPSIS
7 scp [-1246BCpqrv] [-c cipher] [-F ssh_config] [-i identity_file] 7 scp [-12346BCpqrv] [-c cipher] [-F ssh_config] [-i identity_file]
8 [-l limit] [-o ssh_option] [-P port] [-S program] 8 [-l limit] [-o ssh_option] [-P port] [-S program]
9 [[user@]host1:]file1 ... [[user@]host2:]file2 9 [[user@]host1:]file1 ... [[user@]host2:]file2
10 10
@@ -26,6 +26,11 @@ DESCRIPTION
26 26
27 -2 Forces scp to use protocol 2. 27 -2 Forces scp to use protocol 2.
28 28
29 -3 Copies between two remote hosts are transferred through the local
30 host. Without this option the data is copied directly between
31 the two remote hosts. Note that this option disables the
32 progress meter.
33
29 -4 Forces scp to use IPv4 addresses only. 34 -4 Forces scp to use IPv4 addresses only.
30 35
31 -6 Forces scp to use IPv6 addresses only. 36 -6 Forces scp to use IPv6 addresses only.
@@ -83,7 +88,9 @@ DESCRIPTION
83 HostName 88 HostName
84 IdentityFile 89 IdentityFile
85 IdentitiesOnly 90 IdentitiesOnly
91 IPQoS
86 KbdInteractiveDevices 92 KbdInteractiveDevices
93 KexAlgorithms
87 LogLevel 94 LogLevel
88 MACs 95 MACs
89 NoHostAuthenticationForLocalhost 96 NoHostAuthenticationForLocalhost
@@ -131,6 +138,7 @@ DESCRIPTION
131 about their progress. This is helpful in debugging connection, 138 about their progress. This is helpful in debugging connection,
132 authentication, and configuration problems. 139 authentication, and configuration problems.
133 140
141EXIT STATUS
134 The scp utility exits 0 on success, and >0 if an error occurs. 142 The scp utility exits 0 on success, and >0 if an error occurs.
135 143
136SEE ALSO 144SEE ALSO
@@ -145,4 +153,4 @@ AUTHORS
145 Timo Rinne <tri@iki.fi> 153 Timo Rinne <tri@iki.fi>
146 Tatu Ylonen <ylo@cs.hut.fi> 154 Tatu Ylonen <ylo@cs.hut.fi>
147 155
148OpenBSD 4.8 February 8, 2010 OpenBSD 4.8 156OpenBSD 4.8 December 9, 2010 OpenBSD 4.8