- (djm) Fix(?) the ssh hang-on-logout/data-from-child race
This commit is contained in:
parent
d592b63296
commit
a2e53ccb64
|
@ -1,3 +1,6 @@
|
||||||
|
20001129
|
||||||
|
- (djm) Fix(?) the ssh hang-on-logout/data-from-child race
|
||||||
|
|
||||||
20001125
|
20001125
|
||||||
- (djm) Give up privs when reading seed file
|
- (djm) Give up privs when reading seed file
|
||||||
|
|
||||||
|
|
|
@ -1898,13 +1898,12 @@ session_exit_message(Session *s, int status)
|
||||||
* interested in data we write.
|
* interested in data we write.
|
||||||
* Note that we must not call 'chan_read_failed', since there could
|
* Note that we must not call 'chan_read_failed', since there could
|
||||||
* be some more data waiting in the pipe.
|
* be some more data waiting in the pipe.
|
||||||
* djm - This is no longer true as we have allowed one pass through
|
|
||||||
* the select loop before killing the connection
|
|
||||||
*/
|
*/
|
||||||
if (c->ostate != CHAN_OUTPUT_CLOSED)
|
if (c->ostate != CHAN_OUTPUT_CLOSED)
|
||||||
chan_write_failed(c);
|
chan_write_failed(c);
|
||||||
if (c->istate != CHAN_INPUT_CLOSED)
|
if (c->istate != CHAN_INPUT_CLOSED)
|
||||||
chan_read_failed(c);
|
c->istate = CHAN_INPUT_WAIT_DRAIN;
|
||||||
|
|
||||||
s->chanid = -1;
|
s->chanid = -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue