tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- djm@cvs.openbsd.org 2010/11/26 05:52:49 

[scp.c]
     Pass through ssh command-line flags and options when doing remote-remote
     transfers, e.g. to enable agent forwarding which is particularly useful
     in this case; bz#1837 ok dtucker@
This commit is contained in:
Damien Miller 2010-12-01 12:03:19 +11:00
parent f80c3deaaf
commit 87dc0a4188
2 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -29,6 +29,11 @@
[session.c] [session.c]
replace close() loop for fds 3->64 with closefrom(); replace close() loop for fds 3->64 with closefrom();
ok markus deraadt dtucker ok markus deraadt dtucker
- djm@cvs.openbsd.org 2010/11/26 05:52:49
[scp.c]
Pass through ssh command-line flags and options when doing remote-remote
transfers, e.g. to enable agent forwarding which is particularly useful
in this case; bz#1837 ok dtucker@
20101124 20101124
- (dtucker) [platform.c session.c] Move the getluid call out of session.c and - (dtucker) [platform.c session.c] Move the getluid call out of session.c and

32
scp.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: scp.c,v 1.167 2010/09/22 22:58:51 djm Exp $ */ /* $OpenBSD: scp.c,v 1.168 2010/11/26 05:52:49 djm Exp $ */
/* /*
* scp - secure remote copy. This is basically patched BSD rcp which * scp - secure remote copy. This is basically patched BSD rcp which
* uses ssh to do the data transfer (instead of using rcmd). * uses ssh to do the data transfer (instead of using rcmd).
@ -122,6 +122,7 @@ int do_cmd(char *host, char *remuser, char *cmd, int *fdin, int *fdout);
/* Struct for addargs */ /* Struct for addargs */
arglist args; arglist args;
arglist remote_remote_args;
/* Bandwidth limit */ /* Bandwidth limit */
long long limit_kbps = 0; long long limit_kbps = 0;
@ -334,12 +335,13 @@ main(int argc, char **argv)
__progname = ssh_get_progname(argv[0]); __progname = ssh_get_progname(argv[0]);
memset(&args, '\0', sizeof(args)); 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, "%s", ssh_program);
addargs(&args, "-x"); addargs(&args, "-x");
addargs(&args, "-oForwardAgent no"); addargs(&args, "-oForwardAgent=no");
addargs(&args, "-oPermitLocalCommand no"); addargs(&args, "-oPermitLocalCommand=no");
addargs(&args, "-oClearAllForwardings yes"); addargs(&args, "-oClearAllForwardings=yes");
fflag = tflag = 0; fflag = tflag = 0;
while ((ch = getopt(argc, argv, "dfl:prtvBCc:i:P:q1246S:o:F:")) != -1) while ((ch = getopt(argc, argv, "dfl:prtvBCc:i:P:q1246S:o:F:")) != -1)
@ -351,20 +353,26 @@ main(int argc, char **argv)
case '6': case '6':
case 'C': case 'C':
addargs(&args, "-%c", ch); addargs(&args, "-%c", ch);
addargs(&remote_remote_args, "-%c", ch);
break; break;
case 'o': case 'o':
case 'c': case 'c':
case 'i': case 'i':
case 'F': case 'F':
addargs(&remote_remote_args, "-%c", ch);
addargs(&remote_remote_args, "%s", optarg);
addargs(&args, "-%c", ch); addargs(&args, "-%c", ch);
addargs(&args, "%s", optarg); addargs(&args, "%s", optarg);
break; break;
case 'P': case 'P':
addargs(&remote_remote_args, "-p");
addargs(&remote_remote_args, "%s", optarg);
addargs(&args, "-p"); addargs(&args, "-p");
addargs(&args, "%s", optarg); addargs(&args, "%s", optarg);
break; break;
case 'B': case 'B':
addargs(&args, "-oBatchmode yes"); addargs(&remote_remote_args, "-oBatchmode=yes");
addargs(&args, "-oBatchmode=yes");
break; break;
case 'l': case 'l':
limit_kbps = strtonum(optarg, 1, 100 * 1024 * 1024, limit_kbps = strtonum(optarg, 1, 100 * 1024 * 1024,
@ -385,10 +393,12 @@ main(int argc, char **argv)
break; break;
case 'v': case 'v':
addargs(&args, "-v"); addargs(&args, "-v");
addargs(&remote_remote_args, "-v");
verbose_mode = 1; verbose_mode = 1;
break; break;
case 'q': case 'q':
addargs(&args, "-q"); addargs(&args, "-q");
addargs(&remote_remote_args, "-q");
showprogress = 0; showprogress = 0;
break; break;
@ -492,6 +502,7 @@ toremote(char *targ, int argc, char **argv)
char *bp, *host, *src, *suser, *thost, *tuser, *arg; char *bp, *host, *src, *suser, *thost, *tuser, *arg;
arglist alist; arglist alist;
int i; int i;
u_int j;
memset(&alist, '\0', sizeof(alist)); memset(&alist, '\0', sizeof(alist));
alist.list = NULL; alist.list = NULL;
@ -522,12 +533,13 @@ toremote(char *targ, int argc, char **argv)
if (src) { /* remote to remote */ if (src) { /* remote to remote */
freeargs(&alist); freeargs(&alist);
addargs(&alist, "%s", ssh_program); addargs(&alist, "%s", ssh_program);
if (verbose_mode)
addargs(&alist, "-v");
addargs(&alist, "-x"); addargs(&alist, "-x");
addargs(&alist, "-oClearAllForwardings yes"); addargs(&alist, "-oClearAllForwardings=yes");
addargs(&alist, "-n"); addargs(&alist, "-n");
for (j = 0; j < remote_remote_args.num; j++) {
addargs(&alist, "%s",
remote_remote_args.list[j]);
}
*src++ = 0; *src++ = 0;
if (*src == 0) if (*src == 0)
src = "."; src = ".";