search for: q46s

The scp -S patch didn't seem to go in cleanly; here are some fixes against the 0830 snapshot: --- scp.c~ Wed Aug 30 01:11:30 2000 +++ scp.c Fri Sep 1 12:54:14 2000 @@ -262,7 +262,7 @@ extern int optind; fflag = tflag = 0; - while ((ch = getopt(argc, argv, "dfprtvBCc:i:P:q46S")) != EOF) + while ((ch = getopt(argc, argv, "dfprtvBCc:i:P:q46S:")) != EOF) switch (ch) { /* User-visible flags. */ case '4': --- scp.1~ Wed Aug 23 02:46:24 2000 +++ scp.1 Fri Sep 1 13:46:33 2000 @@ -20,6 +20,7 @@ .Sh SYNOPSIS .Nm scp .Op Fl pqrvC46 +.Op Fl S Ar...

Hi. This functionality was just added in 2.2.0p1. The patch is self-explanatory. Charles --- scp.c.orig-2.2.0p1 Tue Aug 29 19:11:30 2000 +++ scp.c Sat Sep 2 15:14:58 2000 @@ -262,7 +262,7 @@ extern int optind; fflag = tflag = 0; - while ((ch = getopt(argc, argv, "dfprtvBCc:i:P:q46S")) != EOF) + while ((ch = getopt(argc, argv, "dfprtvBCc:i:P:q46S:")) != EOF) switch (ch) { /* User-visible flags. */ case '4': --- scp.1.orig-2.2.0p1 Tue Aug 22 20:46:24 2000 +++ scp.1 Sat Sep 2 15:18:00 2000 @@ -20,6 +20,7 @@ .Sh SYNOPSIS .Nm scp .Op Fl pqrvC46...

...openssh/scp.c,v retrieving revision 1.97 diff -u -r1.97 scp.c --- scp.c 21 Jun 2002 00:41:52 -0000 1.97 +++ scp.c 10 Sep 2002 17:37:49 -0000 @@ -233,9 +241,11 @@ addargs(&args, "-oClearAllForwardings yes"); fflag = tflag = 0; - while ((ch = getopt(argc, argv, "dfprtvBCc:i:P:q46S:o:F:")) != -1) + while ((ch = getopt(argc, argv, "dfprtvBCc:i:P:q46S:o:F:12")) != -1) switch (ch) { /* User-visible flags. */ + case '1': + case '2': case '4': case '6': case 'C':

...ot;; args[i++] = "-oFallBackToRsh no"; + if (highport) + args[i++] = "-P"; if (IPv4) args[i++] = "-4"; if (IPv6) *************** *** 262,268 **** extern int optind; fflag = tflag = 0; ! while ((ch = getopt(argc, argv, "dfprtvBCc:i:P:q46S")) != EOF) switch (ch) { /* User-visible flags. */ case '4': --- 267,273 ---- extern int optind; fflag = tflag = 0; ! while ((ch = getopt(argc, argv, "LdfprtvBCc:i:P:q46S")) != EOF) switch (ch) { /* User-visible flags. */ case '4': **...

...pathsep++; + *pathsep = 0; + ssh_program = xmalloc(strlen(argv[0]) + 4); /* "../path" + "ssh\0" */ + strcpy(ssh_program, argv[0]); + strcat(ssh_program, "ssh"); + } + } fflag = tflag = 0; while ((ch = getopt(argc, argv, "dfprtvBCc:i:P:q46S:o:")) != EOF)

...#include "log.h" #include "misc.h" +#include "compat.h" #ifdef HAVE___PROGNAME extern char *__progname; @@ -242,9 +243,15 @@ addargs(&args, "-oClearAllForwardings yes"); fflag = tflag = 0; - while ((ch = getopt(argc, argv, "dfprtvBCc:i:P:q46S:o:F:")) != -1) + while ((ch = getopt(argc, argv, "dfprtvBCc:i:P:q1246S:o:F:")) != -1) switch (ch) { /* User-visible flags. */ + case '1': + addargs(&args, "-oProtocol=1"); + break; + case '2': + addargs(&args, "-oProtocol=2");...

Hi, Several people have asked that scp support the -1 and -2 options, so I wrote this patch. Cheers, Matthew -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: scp.diff Url: http://lists.mindrot.org/pipermail/openssh-unix-dev/attachments/20010722/7e096fab/attachment.ksh -------------- next part -------------- -- "At least you know

...------------ R.I.P. - rest in pieces ... -------------- next part -------------- --- ./scp.c.org Sat Sep 8 23:37:22 2001 +++ ./scp.c Sun Sep 9 00:07:36 2001 @@ -244,9 +244,11 @@ addargs("-oFallBackToRsh no"); fflag = tflag = 0; - while ((ch = getopt(argc, argv, "dfprtvBCc:i:P:q46S:o:")) != -1) + while ((ch = getopt(argc, argv, "dfprtvBCc:i:P:q1246S:o:")) != -1) switch (ch) { /* User-visible flags. */ + case '1': + case '2': case '4': case '6': case 'C': @@ -958,7 +960,7 @@ usage() { (void) fprintf(st...

...filename, since these break the rcp/scp protocol. Cheers, Matthew --- scp.c.orig Thu Sep 27 21:32:32 2001 +++ scp.c Thu Sep 27 21:41:06 2001 @@ -242,9 +242,11 @@ addargs(&args, "-oClearAllForwardings yes"); fflag = tflag = 0; - while ((ch = getopt(argc, argv, "dfprtvBCc:i:P:q46S:o:F:")) != -1) + while ((ch = getopt(argc, argv, "dfprtvBCc:i:P:q1246S:o:F:")) != -1) switch (ch) { /* User-visible flags. */ + case '1': + case '2': case '4': case '6': case 'C': @@ -505,6 +507,12 @@...

...-char cmd[CMDNEEDS]; /* must hold "rcp -r -p -d\0" */ +char *cmd; +int cmdlen; int response(void); void rsource(char *, struct stat *); @@ -236,7 +239,7 @@ addargs(&args, "-oFallBackToRsh no"); fflag = tflag = 0; - while ((ch = getopt(argc, argv, "dfprtvBCc:i:P:q46S:o:")) != -1) + while ((ch = getopt(argc, argv, "dfprtvBCc:i:P:q46S:o:ET:")) != -1) switch (ch) { /* User-visible flags. */ case '4': @@ -270,6 +273,12 @@ case 'q': showprogress = 0; break; + case 'E': + eraseflag = 1; + break; + case...

...; + perror(ssh_program); exit(1); } /* Parent. Close the other side, and return the local side. */ @@ -247,7 +250,7 @@ extern int optind; fflag = tflag = 0; - while ((ch = getopt(argc, argv, "dfprtvBCc:i:P:q46")) != EOF) + while ((ch = getopt(argc, argv, "dfprtvBCc:i:P:q46S:")) != EOF) switch (ch) { /* User-visible flags. */ case '4': @@ -265,6 +268,9 @@ case 'r': iamrecursive = 1; break; + case 'S': + ssh_program = optarg; + break; /* Server options. */ case 'd': targetshouldbedirectory = 1; @@ -...

OpenSSH still has this feature, SSH-1.2.27 no longer has it. Admittedly it can be useful sometimes, even though I'd prefer this to be done using a trivial shell wrapper, which would be the UNIX way of doing things. Not being able to call OpenSSH's ssh by another name (say ``ssh1'') can get in the way when having to maintain two versions of ssh in parallel because the ``ssh ->

...s[i++] = "-oProtocol 1"; + else if (protocol==2) + args[i++] = "-oProtocol 2"; if (IPv4) args[i++] = "-4"; if (IPv6) *************** *** 262,270 **** extern int optind; fflag = tflag = 0; ! while ((ch = getopt(argc, argv, "dfprtvBCc:i:P:q46S")) != EOF) switch (ch) { /* User-visible flags. */ case '4': IPv4 = 1; break; --- 276,302 ---- extern int optind; fflag = tflag = 0; ! while ((ch = getopt(argc, argv, "bdfprtvBCc:i:P:qQS4612")) != EOF) switch (ch) { + /* Server options. *...

...+ char *scp_program = _PATH_SCP_PROGRAM; /* * This function executes the given command as the specified user on the *************** *** 242,248 **** addargs(&args, "-oClearAllForwardings yes"); fflag = tflag = 0; ! while ((ch = getopt(argc, argv, "dfprtvBCc:i:P:q46S:o:F:")) != -1) switch (ch) { /* User-visible flags. */ case '4': --- 243,249 ---- addargs(&args, "-oClearAllForwardings yes"); fflag = tflag = 0; ! while ((ch = getopt(argc, argv, "dfprtvBCc:i:P:q46Ss:o:F:")) != -1) switch (ch) {...