From 4cd24c7e6a2c5aceeb3ba0fafce2de16015a2a90 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Sun, 10 Feb 2008 22:22:29 +1100 Subject: - djm@cvs.openbsd.org 2008/01/19 19:25:50 [scp.1] scp -q implies ssh -q for the underlying connection, it doesn't just hush the progress meter --- scp.1 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'scp.1') diff --git a/scp.1 b/scp.1 index 9b221762b..46b72eda3 100644 --- a/scp.1 +++ b/scp.1 @@ -9,9 +9,9 @@ .\" .\" Created: Sun May 7 00:14:37 1995 ylo .\" -.\" $OpenBSD: scp.1,v 1.42 2007/08/06 19:16:06 sobrado Exp $ +.\" $OpenBSD: scp.1,v 1.43 2008/01/19 19:25:50 djm Exp $ .\" -.Dd $Mdocdate: August 6 2007 $ +.Dd $Mdocdate: January 19 2008 $ .Dt SCP 1 .Os .Sh NAME @@ -178,7 +178,9 @@ is already reserved for preserving the times and modes of the file in Preserves modification times, access times, and modes from the original file. .It Fl q -Disables the progress meter. +Quiet mode: disables the progress meter as well as warning and diagnostic +messages from +.Xr ssh 1 . .It Fl r Recursively copy entire directories. .It Fl S Ar program -- cgit v1.2.3 From b508faa006a6bcf96f9b59f3e9b6da3c867e8a0f Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Sun, 10 Feb 2008 22:28:45 +1100 Subject: - jmc@cvs.openbsd.org 2008/01/31 20:06:50 [scp.1] explain how to handle local file names containing colons; requested by Tamas TEVESZ ok dtucker --- ChangeLog | 7 ++++++- scp.1 | 14 ++++++++++---- 2 files changed, 16 insertions(+), 5 deletions(-) (limited to 'scp.1') diff --git a/ChangeLog b/ChangeLog index d6655ba1f..81ebc742b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -63,6 +63,11 @@ Revert the change for bz #1307 as it causes connection aborts if an IGNORE packet arrives while we're waiting in packet_read_expect (and possibly elsewhere). + - jmc@cvs.openbsd.org 2008/01/31 20:06:50 + [scp.1] + explain how to handle local file names containing colons; + requested by Tamas TEVESZ + ok dtucker 20080119 - (djm) Silence noice from expr in ssh-copy-id; patch from @@ -3591,4 +3596,4 @@ OpenServer 6 and add osr5bigcrypt support so when someone migrates passwords between UnixWare and OpenServer they will still work. OK dtucker@ -$Id: ChangeLog,v 1.4832 2008/02/10 11:27:47 djm Exp $ +$Id: ChangeLog,v 1.4833 2008/02/10 11:28:45 djm Exp $ diff --git a/scp.1 b/scp.1 index 46b72eda3..7122fa40f 100644 --- a/scp.1 +++ b/scp.1 @@ -9,9 +9,9 @@ .\" .\" Created: Sun May 7 00:14:37 1995 ylo .\" -.\" $OpenBSD: scp.1,v 1.43 2008/01/19 19:25:50 djm Exp $ +.\" $OpenBSD: scp.1,v 1.44 2008/01/31 20:06:50 jmc Exp $ .\" -.Dd $Mdocdate: January 19 2008 $ +.Dd $Mdocdate: January 31 2008 $ .Dt SCP 1 .Os .Sh NAME @@ -56,9 +56,15 @@ Unlike will ask for passwords or passphrases if they are needed for authentication. .Pp -Any file name may contain a host and user specification to indicate +File names may contain a user and host specification to indicate that the file is to be copied to/from that host. -Copies between two remote hosts are permitted. +Local file names can be made explicit using absolute or relative pathnames +to avoid +.Nm +treating file names containing +.Sq :\& +as host specifiers. +Copies between two remote hosts are also permitted. .Pp The options are as follows: .Bl -tag -width Ds -- cgit v1.2.3 From c7ce0da3b07a0318fa8407991f47c09a7748f4f6 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Mon, 16 Jun 2008 07:55:06 +1000 Subject: - dtucker@cvs.openbsd.org 2008/06/14 19:42:10 [scp.1] Mention that scp follows symlinks during -r. bz #1466, from nectar at apple --- ChangeLog | 6 +++++- scp.1 | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) (limited to 'scp.1') diff --git a/ChangeLog b/ChangeLog index a4ed90296..3af392c02 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,10 @@ [session.c] suppress the warning message from chdir(homedir) failures when chrooted (bz#1461); ok dtucker + - dtucker@cvs.openbsd.org 2008/06/14 19:42:10 + [scp.1] + Mention that scp follows symlinks during -r. bz #1466, + from nectar at apple 20080614 - (djm) [openbsd-compat/sigact.c] Avoid NULL derefs in ancient sigaction @@ -4383,4 +4387,4 @@ OpenServer 6 and add osr5bigcrypt support so when someone migrates passwords between UnixWare and OpenServer they will still work. OK dtucker@ -$Id: ChangeLog,v 1.5015 2008/06/15 21:53:16 djm Exp $ +$Id: ChangeLog,v 1.5016 2008/06/15 21:55:06 djm Exp $ diff --git a/scp.1 b/scp.1 index 7122fa40f..0c29c9fe8 100644 --- a/scp.1 +++ b/scp.1 @@ -10,8 +10,9 @@ .\" Created: Sun May 7 00:14:37 1995 ylo .\" .\" $OpenBSD: scp.1,v 1.44 2008/01/31 20:06:50 jmc Exp $ +.\" $OpenBSD: scp.1,v 1.45 2008/06/14 19:42:10 dtucker Exp $ .\" -.Dd $Mdocdate: January 31 2008 $ +.Dd $Mdocdate: June 14 2008 $ .Dt SCP 1 .Os .Sh NAME @@ -189,6 +190,9 @@ messages from .Xr ssh 1 . .It Fl r Recursively copy entire directories. +Note that +.Nm +follows symbolic links encountered in the tree traversal. .It Fl S Ar program Name of .Ar program -- cgit v1.2.3 From 87d5e0976c808fc1b5800710529d62ece634ee75 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Mon, 16 Jun 2008 23:27:34 +1000 Subject: Remove extra tag --- scp.1 | 1 - 1 file changed, 1 deletion(-) (limited to 'scp.1') diff --git a/scp.1 b/scp.1 index 0c29c9fe8..ede88fd15 100644 --- a/scp.1 +++ b/scp.1 @@ -9,7 +9,6 @@ .\" .\" Created: Sun May 7 00:14:37 1995 ylo .\" -.\" $OpenBSD: scp.1,v 1.44 2008/01/31 20:06:50 jmc Exp $ .\" $OpenBSD: scp.1,v 1.45 2008/06/14 19:42:10 dtucker Exp $ .\" .Dd $Mdocdate: June 14 2008 $ -- cgit v1.2.3 From a034baf1b958a029a608b231ae4ce95cc24f70e1 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Sat, 12 Jul 2008 17:12:49 +1000 Subject: - djm@cvs.openbsd.org 2008/07/12 05:33:41 [scp.1] better description for -i flag: s/RSA authentication/public key authentication/ --- ChangeLog | 6 +++++- scp.1 | 6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'scp.1') diff --git a/ChangeLog b/ChangeLog index 6244e39b5..a3b7eb02d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,10 @@ [channels.c] unbreak; move clearing of cctx struct to before first use reported by dkrause@ + - djm@cvs.openbsd.org 2008/07/12 05:33:41 + [scp.1] + better description for -i flag: + s/RSA authentication/public key authentication/ 20080711 - (djm) OpenBSD CVS Sync @@ -4629,4 +4633,4 @@ OpenServer 6 and add osr5bigcrypt support so when someone migrates passwords between UnixWare and OpenServer they will still work. OK dtucker@ -$Id: ChangeLog,v 1.5074 2008/07/12 07:12:29 djm Exp $ +$Id: ChangeLog,v 1.5075 2008/07/12 07:12:49 djm Exp $ diff --git a/scp.1 b/scp.1 index ede88fd15..5033d84f2 100644 --- a/scp.1 +++ b/scp.1 @@ -9,9 +9,9 @@ .\" .\" Created: Sun May 7 00:14:37 1995 ylo .\" -.\" $OpenBSD: scp.1,v 1.45 2008/06/14 19:42:10 dtucker Exp $ +.\" $OpenBSD: scp.1,v 1.46 2008/07/12 05:33:41 djm Exp $ .\" -.Dd $Mdocdate: June 14 2008 $ +.Dd $Mdocdate: July 12 2008 $ .Dt SCP 1 .Os .Sh NAME @@ -104,7 +104,7 @@ per-user configuration file for This option is directly passed to .Xr ssh 1 . .It Fl i Ar identity_file -Selects the file from which the identity (private key) for RSA +Selects the file from which the identity (private key) for public key authentication is read. This option is directly passed to .Xr ssh 1 . -- cgit v1.2.3