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