summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--scp.114
-rw-r--r--scp.c8
3 files changed, 20 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index b0255a778..0875c7026 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,9 @@
11 - markus@cvs.openbsd.org 2003/01/23 14:01:53 11 - markus@cvs.openbsd.org 2003/01/23 14:01:53
12 [scp.c] 12 [scp.c]
13 bandwidth limitation patch (scp -l) from niels@; ok todd@, deraadt@ 13 bandwidth limitation patch (scp -l) from niels@; ok todd@, deraadt@
14 - markus@cvs.openbsd.org 2003/01/23 14:06:15
15 [scp.1 scp.c]
16 scp -12; Sam Smith and others; ok provos@, deraadt@
14 17
1520030123 1820030123
16 - (djm) OpenBSD CVS Sync 19 - (djm) OpenBSD CVS Sync
@@ -1070,4 +1073,4 @@
1070 save auth method before monitor_reset_key_state(); bugzilla bug #284; 1073 save auth method before monitor_reset_key_state(); bugzilla bug #284;
1071 ok provos@ 1074 ok provos@
1072 1075
1073$Id: ChangeLog,v 1.2585 2003/01/24 00:36:58 djm Exp $ 1076$Id: ChangeLog,v 1.2586 2003/01/24 00:37:38 djm Exp $
diff --git a/scp.1 b/scp.1
index 396ab64be..9cddd59a7 100644
--- a/scp.1
+++ b/scp.1
@@ -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.\" $OpenBSD: scp.1,v 1.23 2002/06/22 16:41:57 stevesk Exp $ 12.\" $OpenBSD: scp.1,v 1.24 2003/01/23 14:06:15 markus Exp $
13.\" 13.\"
14.Dd September 25, 1999 14.Dd September 25, 1999
15.Dt SCP 1 15.Dt SCP 1
@@ -19,7 +19,7 @@
19.Nd secure copy (remote file copy program) 19.Nd secure copy (remote file copy program)
20.Sh SYNOPSIS 20.Sh SYNOPSIS
21.Nm scp 21.Nm scp
22.Op Fl pqrvBC46 22.Op Fl pqrvBC1246
23.Op Fl F Ar ssh_config 23.Op Fl F Ar ssh_config
24.Op Fl S Ar program 24.Op Fl S Ar program
25.Op Fl P Ar port 25.Op Fl P Ar port
@@ -123,8 +123,16 @@ This is useful for specifying options
123for which there is no separate 123for which there is no separate
124.Nm scp 124.Nm scp
125command-line flag. For example, forcing the use of protocol 125command-line flag. For example, forcing the use of protocol
126version 1 is specified using 126version 1 can be specified using
127.Ic scp -oProtocol=1 . 127.Ic scp -oProtocol=1 .
128.It Fl 1
129Forces
130.Nm
131to use protocol 1.
132.It Fl 2
133Forces
134.Nm
135to use protocol 2.
128.It Fl 4 136.It Fl 4
129Forces 137Forces
130.Nm 138.Nm
diff --git a/scp.c b/scp.c
index ae0a1ead6..60484e769 100644
--- a/scp.c
+++ b/scp.c
@@ -75,7 +75,7 @@
75 */ 75 */
76 76
77#include "includes.h" 77#include "includes.h"
78RCSID("$OpenBSD: scp.c,v 1.99 2003/01/23 14:01:53 markus Exp $"); 78RCSID("$OpenBSD: scp.c,v 1.100 2003/01/23 14:06:15 markus Exp $");
79 79
80#include "xmalloc.h" 80#include "xmalloc.h"
81#include "atomicio.h" 81#include "atomicio.h"
@@ -225,9 +225,11 @@ main(argc, argv)
225 addargs(&args, "-oClearAllForwardings yes"); 225 addargs(&args, "-oClearAllForwardings yes");
226 226
227 fflag = tflag = 0; 227 fflag = tflag = 0;
228 while ((ch = getopt(argc, argv, "dfl:prtvBCc:i:P:q46S:o:F:")) != -1) 228 while ((ch = getopt(argc, argv, "dfl:prtvBCc:i:P:q1246S:o:F:")) != -1)
229 switch (ch) { 229 switch (ch) {
230 /* User-visible flags. */ 230 /* User-visible flags. */
231 case '1':
232 case '2':
231 case '4': 233 case '4':
232 case '6': 234 case '6':
233 case 'C': 235 case 'C':
@@ -1025,7 +1027,7 @@ void
1025usage(void) 1027usage(void)
1026{ 1028{
1027 (void) fprintf(stderr, 1029 (void) fprintf(stderr,
1028 "usage: scp [-pqrvBC46] [-F config] [-S program] [-P port]\n" 1030 "usage: scp [-pqrvBC1246] [-F config] [-S program] [-P port]\n"
1029 " [-c cipher] [-i identity] [-l limit] [-o option]\n" 1031 " [-c cipher] [-i identity] [-l limit] [-o option]\n"
1030 " [[user@]host1:]file1 [...] [[user@]host2:]file2\n"); 1032 " [[user@]host1:]file1 [...] [[user@]host2:]file2\n");
1031 exit(1); 1033 exit(1);