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: another case where a utimes() failure could make scp send 

a desynchronising error; reminded by Aymeric Vincent ok deraadt markus

OpenBSD-Commit-ID: 2ea611d34d8ff6d703a7a8bf858aa5dbfbfa7381
This commit is contained in:
djm@openbsd.org 2020-05-06 20:57:38 +00:00 committed by Darren Tucker
parent 59d531553f
commit 955854cafc
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scp.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: scp.c,v 1.209 2020/05/01 06:31:42 djm Exp $ */ /* $OpenBSD: scp.c,v 1.210 2020/05/06 20:57:38 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).
@ -1427,9 +1427,7 @@ sink(int argc, char **argv, const char *src)
sink(1, vect, src); sink(1, vect, src);
if (setimes) { if (setimes) {
setimes = 0; setimes = 0;
if (utimes(vect[0], tv) == -1) (void) utimes(vect[0], tv);
run_err("%s: set times: %s",
vect[0], strerror(errno));
} }
if (mod_flag) if (mod_flag)
(void) chmod(vect[0], mode); (void) chmod(vect[0], mode);