diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2023-03-27 05:25:08 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2023-03-27 05:28:00 +0200 |
| commit | 4f0a676486700f10a4788f7e9426e94e39c1c89e (patch) | |
| tree | 8b589b1c88508299eccb2a09c0f07fc313658bfe /scp.c | |
| parent | Also look for gdb error message from OpenIndiana. (diff) | |
| download | openssh-4f0a676486700f10a4788f7e9426e94e39c1c89e.tar.xz openssh-4f0a676486700f10a4788f7e9426e94e39c1c89e.zip | |
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
Diffstat (limited to 'scp.c')
| -rw-r--r-- | scp.c | 8 |
1 files changed, 7 insertions, 1 deletions
@@ -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 * 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; arglist alist; int i, r, status; + struct stat sb; u_int j; memset(&alist, '\0', sizeof(alist)); @@ -1178,6 +1179,11 @@ toremote(int argc, char **argv, enum scp_mode_e mode, char *sftp_direct) errs = 1; } else { /* local to remote */ 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) { /* Connect to remote now */ conn = do_sftp_connect(thost, tuser, |