tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (stevesk) nchan.c: remove ostate checks and add EINVAL to 

shutdown(SHUT_RD) error() bypass for HP-UX.
This commit is contained in:
Kevin Steves 2001-04-03 13:02:48 +00:00
parent 3704c2612a
commit efe5fd811b
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -6,6 +6,8 @@
- stevesk@cvs.openbsd.org 2001/04/02 14:20:23 - stevesk@cvs.openbsd.org 2001/04/02 14:20:23
[readconf.c servconf.c] [readconf.c servconf.c]
correct comment; ok markus@ correct comment; ok markus@
- (stevesk) nchan.c: remove ostate checks and add EINVAL to
shutdown(SHUT_RD) error() bypass for HP-UX.
20010402 20010402
- (stevesk) log.c openbsd sync; missing newlines - (stevesk) log.c openbsd sync; missing newlines
@ -4805,4 +4807,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - Released 1.0pre1
$Id: ChangeLog,v 1.1046 2001/04/02 18:20:03 mouring Exp $ $Id: ChangeLog,v 1.1047 2001/04/03 13:02:48 stevesk Exp $

5
nchan.c
View File

@ -489,11 +489,10 @@ chan_shutdown_read(Channel *c)
/* /*
* shutdown(sock, SHUT_READ) may return ENOTCONN if the * shutdown(sock, SHUT_READ) may return ENOTCONN if the
* write side has been closed already. (bug on Linux) * write side has been closed already. (bug on Linux)
* HP-UX will return EINVAL.
*/ */
if (shutdown(c->sock, SHUT_RD) < 0 if (shutdown(c->sock, SHUT_RD) < 0
&& (errno != ENOTCONN && (errno != ENOTCONN && errno != EINVAL))
|| c->ostate == CHAN_OUTPUT_OPEN
|| c->ostate == CHAN_OUTPUT_WAIT_DRAIN))
error("channel %d: chan_shutdown_read: shutdown() failed for fd%d [i%d o%d]: %.100s", error("channel %d: chan_shutdown_read: shutdown() failed for fd%d [i%d o%d]: %.100s",
c->self, c->sock, c->istate, c->ostate, strerror(errno)); c->self, c->sock, c->istate, c->ostate, strerror(errno));
} else { } else {