diff options
| author | Damien Miller <djm@mindrot.org> | 2000-07-15 14:14:16 +1000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2000-07-15 14:14:16 +1000 |
| commit | be484b5d9889ca636fecdf1f6b73ddfbe4cce3c9 (patch) | |
| tree | 8b1023f666bebd274c08fe579a61c70a8a66f283 /scp.c | |
| parent | 055dc369837e1bde0f84a7ecfe669e4e44f10db9 (diff) | |
| download | openssh-git-be484b5d9889ca636fecdf1f6b73ddfbe4cce3c9.tar.gz | |
- (djm) OpenBSD CVS updates
- provos@cvs.openbsd.org 2000/07/13 16:53:22
[aux.c readconf.c servconf.c ssh.h]
allow multiple whitespace but only one '=' between tokens, bug report from
Ralf S. Engelschall <rse@engelschall.com> but different fix. okay deraadt@
- provos@cvs.openbsd.org 2000/07/13 17:14:09
[clientloop.c]
typo; todd@fries.net
- provos@cvs.openbsd.org 2000/07/13 17:19:31
[scp.c]
close can fail on AFS, report error; from Greg Hudson <ghudson@mit.edu>
- markus@cvs.openbsd.org 2000/07/14 16:59:46
[readconf.c servconf.c]
allow leading whitespace. ok niels
- djm@cvs.openbsd.org 2000/07/14 22:01:38
[ssh-keygen.c ssh.c]
Always create ~/.ssh with mode 700; ok Markus
Diffstat (limited to 'scp.c')
| -rw-r--r-- | scp.c | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -45,7 +45,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: scp.c,v 1.32 2000/06/20 01:39:44 markus Exp $"); +RCSID("$OpenBSD: scp.c,v 1.33 2000/07/13 23:19:31 provos Exp $"); #include "ssh.h" #include "xmalloc.h" @@ -889,7 +889,10 @@ bad: run_err("%s: %s", np, strerror(errno)); run_err("%s: set mode: %s", np, strerror(errno)); } - (void) close(ofd); + if (close(ofd) == -1) { + wrerr = YES; + wrerrno = errno; + } (void) response(); if (setimes && wrerr == NO) { setimes = 0; @@ -1015,7 +1018,7 @@ run_err(const char *fmt,...) * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $OpenBSD: scp.c,v 1.32 2000/06/20 01:39:44 markus Exp $ + * $OpenBSD: scp.c,v 1.33 2000/07/13 23:19:31 provos Exp $ */ char * |