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: scp: when copying local->remote, check that source file 

exists before opening SFTP connection to the server. Based on GHPR#370 ok
dtucker, markus

OpenBSD-Commit-ID: b4dd68e15bfe22ce4fac9960a1066a2b721e54fb
This commit is contained in:
djm@openbsd.org 2023-03-27 03:25:08 +00:00 committed by Damien Miller
parent 154d8baf63
commit 4f0a676486
No known key found for this signature in database
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scp.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: scp.c,v 1.253 2023/03/03 03:12:24 dtucker Exp $ */ /* $OpenBSD: scp.c,v 1.254 2023/03/27 03:25:08 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).
@ -1036,6 +1036,7 @@ toremote(int argc, char **argv, enum scp_mode_e mode, char *sftp_direct)
struct sftp_conn *conn = NULL, *conn2 = NULL; struct sftp_conn *conn = NULL, *conn2 = NULL;
arglist alist; arglist alist;
int i, r, status; int i, r, status;
struct stat sb;
u_int j; u_int j;
memset(&alist, '\0', sizeof(alist)); memset(&alist, '\0', sizeof(alist));
@ -1178,6 +1179,11 @@ toremote(int argc, char **argv, enum scp_mode_e mode, char *sftp_direct)
errs = 1; errs = 1;
} else { /* local to remote */ } else { /* local to remote */
if (mode == MODE_SFTP) { if (mode == MODE_SFTP) {
/* no need to glob: already done by shell */
if (stat(argv[i], &sb) != 0) {
fatal("stat local \"%s\": %s", argv[i],
strerror(errno));
}
if (remin == -1) { if (remin == -1) {
/* Connect to remote now */ /* Connect to remote now */
conn = do_sftp_connect(thost, tuser, conn = do_sftp_connect(thost, tuser,