Attachment 1968 Details for Bug 1837 – /home/djm/scp-propagate-opts.diff

[patch] /home/djm/scp-propagate-opts.diff

scp-propagate-opts.diff (text/plain), 2.85 KB, created by Damien Miller on 2010-11-26 07:36:54 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Damien Miller

Created: 2010-11-26 07:36:54 AEDT

Size: 2.85 KB

patch

obsolete

>Index: scp.c
>===================================================================
>RCS file: /cvs/src/usr.bin/ssh/scp.c,v
>retrieving revision 1.167
>diff -u -p -r1.167 scp.c
>--- scp.c	22 Sep 2010 22:58:51 -0000	1.167
>+++ scp.c	25 Nov 2010 20:35:23 -0000
>@@ -106,6 +106,7 @@ int do_cmd(char *host, char *remuser, ch
> 
> /* Struct for addargs */
> arglist args;
>+arglist remote_remote_args;
> 
> /* Bandwidth limit */
> long long limit_kbps = 0;
>@@ -316,12 +317,13 @@ main(int argc, char **argv)
> 	argv = newargv;
> 
> 	memset(&args, '\0', sizeof(args));
>-	args.list = NULL;
>+	memset(&remote_remote_args, '\0', sizeof(remote_remote_args));
>+	args.list = remote_remote_args.list = NULL;
> 	addargs(&args, "%s", ssh_program);
> 	addargs(&args, "-x");
>-	addargs(&args, "-oForwardAgent no");
>-	addargs(&args, "-oPermitLocalCommand no");
>-	addargs(&args, "-oClearAllForwardings yes");
>+	addargs(&args, "-oForwardAgent=no");
>+	addargs(&args, "-oPermitLocalCommand=no");
>+	addargs(&args, "-oClearAllForwardings=yes");
> 
> 	fflag = tflag = 0;
> 	while ((ch = getopt(argc, argv, "dfl:prtvBCc:i:P:q1246S:o:F:")) != -1)
>@@ -333,20 +335,26 @@ main(int argc, char **argv)
> 		case '6':
> 		case 'C':
> 			addargs(&args, "-%c", ch);
>+			addargs(&remote_remote_args, "-%c", ch);
> 			break;
> 		case 'o':
> 		case 'c':
> 		case 'i':
> 		case 'F':
>+			addargs(&remote_remote_args, "-%c", ch);
>+			addargs(&remote_remote_args, "%s", optarg);
> 			addargs(&args, "-%c", ch);
> 			addargs(&args, "%s", optarg);
> 			break;
> 		case 'P':
>+			addargs(&remote_remote_args, "-p");
>+			addargs(&remote_remote_args, "%s", optarg);
> 			addargs(&args, "-p");
> 			addargs(&args, "%s", optarg);
> 			break;
> 		case 'B':
>-			addargs(&args, "-oBatchmode yes");
>+			addargs(&remote_remote_args, "-oBatchmode=yes");
>+			addargs(&args, "-oBatchmode=yes");
> 			break;
> 		case 'l':
> 			limit_kbps = strtonum(optarg, 1, 100 * 1024 * 1024,
>@@ -367,10 +375,12 @@ main(int argc, char **argv)
> 			break;
> 		case 'v':
> 			addargs(&args, "-v");
>+			addargs(&remote_remote_args, "-v");
> 			verbose_mode = 1;
> 			break;
> 		case 'q':
> 			addargs(&args, "-q");
>+			addargs(&remote_remote_args, "-q");
> 			showprogress = 0;
> 			break;
> 
>@@ -471,6 +481,7 @@ toremote(char *targ, int argc, char **ar
> 	char *bp, *host, *src, *suser, *thost, *tuser, *arg;
> 	arglist alist;
> 	int i;
>+	u_int j;
> 
> 	memset(&alist, '\0', sizeof(alist));
> 	alist.list = NULL;
>@@ -501,12 +512,13 @@ toremote(char *targ, int argc, char **ar
> 		if (src) {	/* remote to remote */
> 			freeargs(&alist);
> 			addargs(&alist, "%s", ssh_program);
>-			if (verbose_mode)
>-				addargs(&alist, "-v");
> 			addargs(&alist, "-x");
>-			addargs(&alist, "-oClearAllForwardings yes");
>+			addargs(&alist, "-oClearAllForwardings=yes");
> 			addargs(&alist, "-n");
>-
>+			for (j = 0; j < remote_remote_args.num; j++) {
>+				addargs(&alist, "%s",
>+				    remote_remote_args.list[j]);
>+			}
> 			*src++ = 0;
> 			if (*src == 0)
> 				src = ".";

Flags:

dtucker: ok+

Actions: View | Diff

Attachments on bug 1837: 1963 | 1966 | 1968