summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2014-04-20 13:02:58 +1000
committerDamien Miller <djm@mindrot.org>2014-04-20 13:02:58 +1000
commit6e1777f592f15f4559728c78204617537b1ac076 (patch)
tree9dd9a92a3c5fbf2d2061c92498febc60b142bc98
parenteb1b7c514d2a7b1802ccee8cd50e565a4d419887 (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--ChangeLog7
-rw-r--r--scp.114
2 files changed, 11 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index c1f95102..a12c4b98 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,6 +25,13 @@
usage: ssh-keygen [-q] [-b bits] [-t dsa | ecdsa | ed25519 | rsa | rsa1]
[-N new_passphrase] [-C comment] [-f output_keyfile]
ok schwarze jmc
+ - tedu@cvs.openbsd.org 2014/03/17 19:44:10
+ [ssh.1]
+ old descriptions of des and blowfish are old. maybe ok deraadt
+ - tedu@cvs.openbsd.org 2014/03/19 14:42:44
+ [scp.1]
+ there is no need for rcp anymore
+ ok deraadt millert
20140401
- (djm) On platforms that support it, use prctl() to prevent sftp-server
diff --git a/scp.1 b/scp.1
index 3b67cff0..1791b618 100644
--- a/scp.1
+++ b/scp.1
@@ -8,9 +8,9 @@
.\"
.\" Created: Sun May 7 00:14:37 1995 ylo
.\"
-.\" $OpenBSD: scp.1,v 1.61 2013/10/20 09:51:26 djm Exp $
+.\" $OpenBSD: scp.1,v 1.62 2014/03/19 14:42:44 tedu Exp $
.\"
-.Dd $Mdocdate: October 20 2013 $
+.Dd $Mdocdate: March 19 2014 $
.Dt SCP 1
.Os
.Sh NAME
@@ -49,8 +49,6 @@ It uses
for data transfer, and uses the same authentication and provides the
same security as
.Xr ssh 1 .
-Unlike
-.Xr rcp 1 ,
.Nm
will ask for passwords or passphrases if they are needed for
authentication.
@@ -191,8 +189,7 @@ Note that this option is written with a capital
.Sq P ,
because
.Fl p
-is already reserved for preserving the times and modes of the file in
-.Xr rcp 1 .
+is already reserved for preserving the times and modes of the file.
.It Fl p
Preserves modification times, access times, and modes from the
original file.
@@ -225,7 +222,6 @@ debugging connection, authentication, and configuration problems.
.Sh EXIT STATUS
.Ex -std scp
.Sh SEE ALSO
-.Xr rcp 1 ,
.Xr sftp 1 ,
.Xr ssh 1 ,
.Xr ssh-add 1 ,
@@ -235,9 +231,7 @@ debugging connection, authentication, and configuration problems.
.Xr sshd 8
.Sh HISTORY
.Nm
-is based on the
-.Xr rcp 1
-program in
+is based on the rcp program in
.Bx
source code from the Regents of the University of California.
.Sh AUTHORS