diff options
author | deraadt@openbsd.org <deraadt@openbsd.org> | 2019-06-28 13:35:04 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2019-07-05 11:10:39 +1000 |
commit | 4d28fa78abce2890e136281950633fae2066cc29 (patch) | |
tree | 33226ec64ced661bb7e40005e30744b68fa59a80 /monitor_wrap.c | |
parent | e8c974043c1648eab0ad67a7ba6a3e444fe79d2d (diff) |
upstream: When system calls indicate an error they return -1, not
some arbitrary value < 0. errno is only updated in this case. Change all
(most?) callers of syscalls to follow this better, and let's see if this
strictness helps us in the future.
OpenBSD-Commit-ID: 48081f00db7518e3b712a49dca06efc2a5428075
Diffstat (limited to 'monitor_wrap.c')
-rw-r--r-- | monitor_wrap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/monitor_wrap.c b/monitor_wrap.c index 186e8f022..4169b7604 100644 --- a/monitor_wrap.c +++ b/monitor_wrap.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: monitor_wrap.c,v 1.112 2019/01/21 09:54:11 djm Exp $ */ | 1 | /* $OpenBSD: monitor_wrap.c,v 1.113 2019/06/28 13:35:04 deraadt Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> | 3 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> |
4 | * Copyright 2002 Markus Friedl <markus@openbsd.org> | 4 | * Copyright 2002 Markus Friedl <markus@openbsd.org> |
@@ -612,7 +612,7 @@ mm_session_pty_cleanup2(Session *s) | |||
612 | sshbuf_free(m); | 612 | sshbuf_free(m); |
613 | 613 | ||
614 | /* closed dup'ed master */ | 614 | /* closed dup'ed master */ |
615 | if (s->ptymaster != -1 && close(s->ptymaster) < 0) | 615 | if (s->ptymaster != -1 && close(s->ptymaster) == -1) |
616 | error("close(s->ptymaster/%d): %s", | 616 | error("close(s->ptymaster/%d): %s", |
617 | s->ptymaster, strerror(errno)); | 617 | s->ptymaster, strerror(errno)); |
618 | 618 | ||