diff options
author | Damien Miller <djm@mindrot.org> | 2014-04-20 13:02:58 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2014-04-20 13:02:58 +1000 |
commit | 6e1777f592f15f4559728c78204617537b1ac076 (patch) | |
tree | 9dd9a92a3c5fbf2d2061c92498febc60b142bc98 | |
parent | eb1b7c514d2a7b1802ccee8cd50e565a4d419887 (diff) |
- tedu@cvs.openbsd.org 2014/03/19 14:42:44
[scp.1]
there is no need for rcp anymore
ok deraadt millert
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | scp.1 | 14 |
2 files changed, 11 insertions, 10 deletions
@@ -25,6 +25,13 @@ | |||
25 | usage: ssh-keygen [-q] [-b bits] [-t dsa | ecdsa | ed25519 | rsa | rsa1] | 25 | usage: ssh-keygen [-q] [-b bits] [-t dsa | ecdsa | ed25519 | rsa | rsa1] |
26 | [-N new_passphrase] [-C comment] [-f output_keyfile] | 26 | [-N new_passphrase] [-C comment] [-f output_keyfile] |
27 | ok schwarze jmc | 27 | ok schwarze jmc |
28 | - tedu@cvs.openbsd.org 2014/03/17 19:44:10 | ||
29 | [ssh.1] | ||
30 | old descriptions of des and blowfish are old. maybe ok deraadt | ||
31 | - tedu@cvs.openbsd.org 2014/03/19 14:42:44 | ||
32 | [scp.1] | ||
33 | there is no need for rcp anymore | ||
34 | ok deraadt millert | ||
28 | 35 | ||
29 | 20140401 | 36 | 20140401 |
30 | - (djm) On platforms that support it, use prctl() to prevent sftp-server | 37 | - (djm) On platforms that support it, use prctl() to prevent sftp-server |
@@ -8,9 +8,9 @@ | |||
8 | .\" | 8 | .\" |
9 | .\" Created: Sun May 7 00:14:37 1995 ylo | 9 | .\" Created: Sun May 7 00:14:37 1995 ylo |
10 | .\" | 10 | .\" |
11 | .\" $OpenBSD: scp.1,v 1.61 2013/10/20 09:51:26 djm Exp $ | 11 | .\" $OpenBSD: scp.1,v 1.62 2014/03/19 14:42:44 tedu Exp $ |
12 | .\" | 12 | .\" |
13 | .Dd $Mdocdate: October 20 2013 $ | 13 | .Dd $Mdocdate: March 19 2014 $ |
14 | .Dt SCP 1 | 14 | .Dt SCP 1 |
15 | .Os | 15 | .Os |
16 | .Sh NAME | 16 | .Sh NAME |
@@ -49,8 +49,6 @@ It uses | |||
49 | for data transfer, and uses the same authentication and provides the | 49 | for data transfer, and uses the same authentication and provides the |
50 | same security as | 50 | same security as |
51 | .Xr ssh 1 . | 51 | .Xr ssh 1 . |
52 | Unlike | ||
53 | .Xr rcp 1 , | ||
54 | .Nm | 52 | .Nm |
55 | will ask for passwords or passphrases if they are needed for | 53 | will ask for passwords or passphrases if they are needed for |
56 | authentication. | 54 | authentication. |
@@ -191,8 +189,7 @@ Note that this option is written with a capital | |||
191 | .Sq P , | 189 | .Sq P , |
192 | because | 190 | because |
193 | .Fl p | 191 | .Fl p |
194 | is already reserved for preserving the times and modes of the file in | 192 | is already reserved for preserving the times and modes of the file. |
195 | .Xr rcp 1 . | ||
196 | .It Fl p | 193 | .It Fl p |
197 | Preserves modification times, access times, and modes from the | 194 | Preserves modification times, access times, and modes from the |
198 | original file. | 195 | original file. |
@@ -225,7 +222,6 @@ debugging connection, authentication, and configuration problems. | |||
225 | .Sh EXIT STATUS | 222 | .Sh EXIT STATUS |
226 | .Ex -std scp | 223 | .Ex -std scp |
227 | .Sh SEE ALSO | 224 | .Sh SEE ALSO |
228 | .Xr rcp 1 , | ||
229 | .Xr sftp 1 , | 225 | .Xr sftp 1 , |
230 | .Xr ssh 1 , | 226 | .Xr ssh 1 , |
231 | .Xr ssh-add 1 , | 227 | .Xr ssh-add 1 , |
@@ -235,9 +231,7 @@ debugging connection, authentication, and configuration problems. | |||
235 | .Xr sshd 8 | 231 | .Xr sshd 8 |
236 | .Sh HISTORY | 232 | .Sh HISTORY |
237 | .Nm | 233 | .Nm |
238 | is based on the | 234 | is based on the rcp program in |
239 | .Xr rcp 1 | ||
240 | program in | ||
241 | .Bx | 235 | .Bx |
242 | source code from the Regents of the University of California. | 236 | source code from the Regents of the University of California. |
243 | .Sh AUTHORS | 237 | .Sh AUTHORS |