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

upstream: prepare for scp -3 implemented via sftp 

OpenBSD-Commit-ID: 194aac0dd87cb175334b71c2a30623a5ad55bb44
This commit is contained in:
djm@openbsd.org 2021-08-07 00:00:33 +00:00 committed by Damien Miller
parent 395d8fbdb0
commit e3c0ba0587
1 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
scp.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: scp.c,v 1.217 2021/08/04 01:34:55 dtucker Exp $ */ /* $OpenBSD: scp.c,v 1.218 2021/08/07 00:00:33 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).
@ -453,6 +453,8 @@ main(int argc, char **argv)
__progname = ssh_get_progname(argv[0]); __progname = ssh_get_progname(argv[0]);
log_init(argv0, log_level, SYSLOG_FACILITY_USER, 1);
memset(&args, '\0', sizeof(args)); memset(&args, '\0', sizeof(args));
memset(&remote_remote_args, '\0', sizeof(remote_remote_args)); memset(&remote_remote_args, '\0', sizeof(remote_remote_args));
args.list = remote_remote_args.list = NULL; args.list = remote_remote_args.list = NULL;
@ -576,11 +578,8 @@ main(int argc, char **argv)
/* Do this last because we want the user to be able to override it */ /* Do this last because we want the user to be able to override it */
addargs(&args, "-oForwardAgent=no"); addargs(&args, "-oForwardAgent=no");
if (mode != MODE_SFTP && sftp_direct != NULL) if (iamremote)
fatal("SFTP direct can be used only in SFTP mode"); mode = MODE_SCP;
if (mode == MODE_SFTP && iamremote)
fatal("The server can not be ran in SFTP mode");
if ((pwd = getpwuid(userid = getuid())) == NULL) if ((pwd = getpwuid(userid = getuid())) == NULL)
fatal("unknown user %u", (u_int) userid); fatal("unknown user %u", (u_int) userid);
@ -1012,11 +1011,7 @@ toremote(int argc, char **argv, enum scp_mode_e mode, char *sftp_direct)
continue; continue;
} }
if (host && throughlocal) { /* extended remote to remote */ if (host && throughlocal) { /* extended remote to remote */
if (mode == MODE_SFTP) { /* XXX uses scp; need to support SFTP remote-remote */
/* TODO */
fatal("Extended remote to remote through local "
"is not yet supported with SFTP");
}
xasprintf(&bp, "%s -f %s%s", cmd, xasprintf(&bp, "%s -f %s%s", cmd,
*src == '-' ? "-- " : "", src); *src == '-' ? "-- " : "", src);
if (do_cmd(ssh_program, host, suser, sport, bp, if (do_cmd(ssh_program, host, suser, sport, bp,
@ -1068,14 +1063,6 @@ toremote(int argc, char **argv, enum scp_mode_e mode, char *sftp_direct)
addargs(&alist, "--"); addargs(&alist, "--");
addargs(&alist, "%s", host); addargs(&alist, "%s", host);
addargs(&alist, "%s", cmd); addargs(&alist, "%s", cmd);
/*
* This will work only if the first remote scp
* supports sftp mode
*/
if (mode == MODE_SFTP) {
addargs(&alist, "-M");
addargs(&alist, "sftp");
}
addargs(&alist, "%s", src); addargs(&alist, "%s", src);
addargs(&alist, "%s%s%s:%s", addargs(&alist, "%s%s%s:%s",
tuser ? tuser : "", tuser ? "@" : "", tuser ? tuser : "", tuser ? "@" : "",