summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Steves <stevesk@pobox.com>2001-09-18 16:08:24 +0000
committerKevin Steves <stevesk@pobox.com>2001-09-18 16:08:24 +0000
commit871f662cb64b70e723c3486d872fcb497a0c3f56 (patch)
tree7391610a5293448c51565d32e6f757b4576e4aa1
parentcc7aafc7a4d59b3f25c511a24b593e73232b7074 (diff)
- (stevesk) nchan.c: we use X/Open Sockets on HP-UX now so shutdown(2)
returns ENOTCONN vs. EINVAL for socket not connected; remove EINVAL check. ok Lutz Jaenicke
-rw-r--r--ChangeLog5
-rw-r--r--nchan.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 10f1a481..f659b885 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,9 @@
put somewhere sane. Add Ssh.bin to manifest.
- (djm) Make smartcard support conditional in Redhat RPM spec
- (bal) LICENCE update. Has not been done in a while.
+ - (stevesk) nchan.c: we use X/Open Sockets on HP-UX now so shutdown(2)
+ returns ENOTCONN vs. EINVAL for socket not connected; remove EINVAL
+ check. ok Lutz Jaenicke
- OpenBSD CVS Sync
- stevesk@cvs.openbsd.org 2001/09/17 17:57:57
[scp.1 scp.c sftp.1 sftp.c]
@@ -6501,4 +6504,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
-$Id: ChangeLog,v 1.1540 2001/09/18 05:56:57 mouring Exp $
+$Id: ChangeLog,v 1.1541 2001/09/18 16:08:24 stevesk Exp $
diff --git a/nchan.c b/nchan.c
index 43d80bf2..5c18487f 100644
--- a/nchan.c
+++ b/nchan.c
@@ -534,10 +534,10 @@ chan_shutdown_read(Channel *c)
/*
* shutdown(sock, SHUT_READ) may return ENOTCONN if the
* write side has been closed already. (bug on Linux)
- * HP-UX will return EINVAL.
+ * HP-UX may return ENOTCONN also.
*/
if (shutdown(c->sock, SHUT_RD) < 0
- && (errno != ENOTCONN && errno != EINVAL))
+ && errno != ENOTCONN)
error("channel %d: chan_shutdown_read: "
"shutdown() failed for fd%d [i%d o%d]: %.100s",
c->self, c->sock, c->istate, c->ostate,