=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/scp.c,v retrieving revision 1.253 retrieving revision 1.254 diff -u -r1.253 -r1.254 --- src/usr.bin/ssh/scp.c 2023/03/03 03:12:24 1.253 +++ src/usr.bin/ssh/scp.c 2023/03/27 03:25:08 1.254 @@ -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). @@ -975,6 +975,7 @@ struct sftp_conn *conn = NULL, *conn2 = NULL; arglist alist; int i, r, status; + struct stat sb; u_int j; memset(&alist, '\0', sizeof(alist)); @@ -1117,6 +1118,11 @@ 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,