]>
Commit | Line | Data |
---|---|---|
4ececab3 | 1 | --- openssh-3.3p1/scp.c.orig Fri Jun 21 02:41:52 2002 |
2 | +++ openssh-3.3p1/scp.c Sun Jun 23 21:29:30 2002 | |
3 | @@ -233,9 +233,11 @@ | |
3c11de19 | 4 | addargs(&args, "-oClearAllForwardings yes"); |
5cdc1302 PG |
5 | |
6 | fflag = tflag = 0; | |
3c11de19 | 7 | - while ((ch = getopt(argc, argv, "dfprtvBCc:i:P:q46S:o:F:")) != -1) |
8 | + while ((ch = getopt(argc, argv, "dfprtvBCc:i:P:q1246S:o:F:")) != -1) | |
5cdc1302 PG |
9 | switch (ch) { |
10 | /* User-visible flags. */ | |
11 | + case '1': | |
12 | + case '2': | |
13 | case '4': | |
14 | case '6': | |
15 | case 'C': | |
4ececab3 | 16 | @@ -955,7 +957,7 @@ |
17 | usage(void) | |
5cdc1302 | 18 | { |
3c11de19 | 19 | (void) fprintf(stderr, |
4ececab3 | 20 | - "usage: scp [-pqrvBC46] [-F config] [-S program] [-P port]\n" |
21 | + "usage: scp [-pqrvBC1246] [-F config] [-S program] [-P port]\n" | |
22 | " [-c cipher] [-i identity] [-o option]\n" | |
23 | " [[user@]host1:]file1 [...] [[user@]host2:]file2\n"); | |
5cdc1302 | 24 | exit(1); |
3c11de19 | 25 | --- openssh-2.9.9p2/scp.1.orig Tue Sep 18 07:56:57 2001 |
26 | +++ openssh-2.9.9p2/scp.1 Fri Sep 28 05:30:54 2001 | |
5cdc1302 PG |
27 | @@ -19,7 +19,7 @@ |
28 | .Nd secure copy (remote file copy program) | |
29 | .Sh SYNOPSIS | |
30 | .Nm scp | |
3c11de19 | 31 | -.Op Fl pqrvBC46 |
32 | +.Op Fl pqrvBC1246 | |
33 | .Op Fl F Ar ssh_config | |
5cdc1302 PG |
34 | .Op Fl S Ar program |
35 | .Op Fl P Ar port | |
3c11de19 | 36 | @@ -125,6 +125,14 @@ |
37 | command-line flag. For example, forcing the use of protocol | |
38 | version 1 is specified using | |
39 | .Ic scp -oProtocol=1 . | |
5cdc1302 PG |
40 | +.It Fl 1 |
41 | +Forces | |
42 | +.Nm | |
43 | +to use SSH1 only. | |
44 | +.It Fl 2 | |
45 | +Forces | |
46 | +.Nm | |
47 | +to use SSH2 only. | |
48 | .It Fl 4 | |
49 | Forces | |
50 | .Nm |