diff options
author | Damien Miller <djm@mindrot.org> | 2003-01-24 11:37:38 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2003-01-24 11:37:38 +1100 |
commit | 8e12147df54c5e490e847bbc0ede41ac0a17af9c (patch) | |
tree | c983740f1610c906656485cde02e27b69a4fca8f | |
parent | ff74d748e941fd9078aa8ac3fddecd249ab8ceb2 (diff) |
- markus@cvs.openbsd.org 2003/01/23 14:06:15
[scp.1 scp.c]
scp -12; Sam Smith and others; ok provos@, deraadt@
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | scp.1 | 14 | ||||
-rw-r--r-- | scp.c | 8 |
3 files changed, 20 insertions, 7 deletions
@@ -11,6 +11,9 @@ - markus@cvs.openbsd.org 2003/01/23 14:01:53 [scp.c] bandwidth limitation patch (scp -l) from niels@; ok todd@, deraadt@ + - markus@cvs.openbsd.org 2003/01/23 14:06:15 + [scp.1 scp.c] + scp -12; Sam Smith and others; ok provos@, deraadt@ 20030123 - (djm) OpenBSD CVS Sync @@ -1070,4 +1073,4 @@ save auth method before monitor_reset_key_state(); bugzilla bug #284; ok provos@ -$Id: ChangeLog,v 1.2585 2003/01/24 00:36:58 djm Exp $ +$Id: ChangeLog,v 1.2586 2003/01/24 00:37:38 djm Exp $ @@ -9,7 +9,7 @@ .\" .\" Created: Sun May 7 00:14:37 1995 ylo .\" -.\" $OpenBSD: scp.1,v 1.23 2002/06/22 16:41:57 stevesk Exp $ +.\" $OpenBSD: scp.1,v 1.24 2003/01/23 14:06:15 markus Exp $ .\" .Dd September 25, 1999 .Dt SCP 1 @@ -19,7 +19,7 @@ .Nd secure copy (remote file copy program) .Sh SYNOPSIS .Nm scp -.Op Fl pqrvBC46 +.Op Fl pqrvBC1246 .Op Fl F Ar ssh_config .Op Fl S Ar program .Op Fl P Ar port @@ -123,8 +123,16 @@ This is useful for specifying options for which there is no separate .Nm scp command-line flag. For example, forcing the use of protocol -version 1 is specified using +version 1 can be specified using .Ic scp -oProtocol=1 . +.It Fl 1 +Forces +.Nm +to use protocol 1. +.It Fl 2 +Forces +.Nm +to use protocol 2. .It Fl 4 Forces .Nm @@ -75,7 +75,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: scp.c,v 1.99 2003/01/23 14:01:53 markus Exp $"); +RCSID("$OpenBSD: scp.c,v 1.100 2003/01/23 14:06:15 markus Exp $"); #include "xmalloc.h" #include "atomicio.h" @@ -225,9 +225,11 @@ main(argc, argv) addargs(&args, "-oClearAllForwardings yes"); fflag = tflag = 0; - while ((ch = getopt(argc, argv, "dfl:prtvBCc:i:P:q46S:o:F:")) != -1) + while ((ch = getopt(argc, argv, "dfl:prtvBCc:i:P:q1246S:o:F:")) != -1) switch (ch) { /* User-visible flags. */ + case '1': + case '2': case '4': case '6': case 'C': @@ -1025,7 +1027,7 @@ void usage(void) { (void) fprintf(stderr, - "usage: scp [-pqrvBC46] [-F config] [-S program] [-P port]\n" + "usage: scp [-pqrvBC1246] [-F config] [-S program] [-P port]\n" " [-c cipher] [-i identity] [-l limit] [-o option]\n" " [[user@]host1:]file1 [...] [[user@]host2:]file2\n"); exit(1); |