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

1 files changed, 3 insertions, 3 deletions

diff --git a/nchan.c b/nchan.c
index 8294d7fca..1e96eb641 100644
--- a/nchan.c
+++ b/nchan.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nchan.c,v 1.69 2018/10/04 07:47:35 djm Exp $ */
+/* $OpenBSD: nchan.c,v 1.70 2019/06/28 13:35:04 deraadt Exp $ */
 /*
  * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl.  All rights reserved.
  *
@@ -380,7 +380,7 @@ chan_shutdown_write(struct ssh *ssh, Channel *c)
             c->self, __func__, c->istate, c->ostate, c->sock, c->wfd, c->efd,
             channel_format_extended_usage(c));
         if (c->sock != -1) {
-                if (shutdown(c->sock, SHUT_WR) < 0) {
+                if (shutdown(c->sock, SHUT_WR) == -1) {
                         debug2("channel %d: %s: shutdown() failed for "
                             "fd %d [i%d o%d]: %.100s", c->self, __func__,
                             c->sock, c->istate, c->ostate,
@@ -410,7 +410,7 @@ chan_shutdown_read(struct ssh *ssh, Channel *c)
                  * write side has been closed already. (bug on Linux)
                  * HP-UX may return ENOTCONN also.
                  */
-                if (shutdown(c->sock, SHUT_RD) < 0 && errno != ENOTCONN) {
+                if (shutdown(c->sock, SHUT_RD) == -1 && errno != ENOTCONN) {
                         error("channel %d: %s: shutdown() failed for "
                             "fd %d [i%d o%d]: %.100s",
                             c->self, __func__, c->sock, c->istate, c->ostate,