diff options
| author |   djm <djm@openbsd.org> | 2020-05-06 20:57:38 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2020-05-06 20:57:38 +0000 |
| commit | 1a502f3ccf25b541c193d868d601493eb2acc75a (patch) | |
| tree | 206cdebb660d3c5908ecb88ed6d5dbb7becff8bb | |
| parent | Currently LibreSSL reports an unknown SSL_internal error. Adjust (diff) | |
| download | wireguard-openbsd-1a502f3ccf25b541c193d868d601493eb2acc75a.tar.xz wireguard-openbsd-1a502f3ccf25b541c193d868d601493eb2acc75a.zip | |
another case where a utimes() failure could make scp send a
desynchronising error; reminded by Aymeric Vincent
ok deraadt markus
| -rw-r--r-- | usr.bin/ssh/scp.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/usr.bin/ssh/scp.c b/usr.bin/ssh/scp.c index c888a7b8ded..9fcbf9c3955 100644 --- a/usr.bin/ssh/scp.c +++ b/usr.bin/ssh/scp.c @@ -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 * uses ssh to do the data transfer (instead of using rcmd). @@ -1400,9 +1400,7 @@ sink(int argc, char **argv, const char *src) sink(1, vect, src); if (setimes) { setimes = 0; - if (utimes(vect[0], tv) == -1) - run_err("%s: set times: %s", - vect[0], strerror(errno)); + (void) utimes(vect[0], tv); } if (mod_flag) (void) chmod(vect[0], mode); |