diff options
author | Darren Tucker <dtucker@zip.com.au> | 2011-11-04 10:55:24 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2011-11-04 10:55:24 +1100 |
commit | 9c5d553d58b3f9671619ef4496c290f1b2edbf92 (patch) | |
tree | 56b6999373bd62a6ca7f450ceb00ed027c8f0866 | |
parent | 2d6665d944439e48b2d7c283eaddfee0890236e8 (diff) |
- djm@cvs.openbsd.org 2011/10/24 02:13:13
[session.c]
bz#1859: send tty break to pty master instead of (probably already
closed) slave side; "looks good" markus@
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | session.c | 4 |
2 files changed, 6 insertions, 2 deletions
@@ -17,6 +17,10 @@ | |||
17 | bz#1943: unbreak stdio forwarding when ControlPersist is in user - ssh | 17 | bz#1943: unbreak stdio forwarding when ControlPersist is in user - ssh |
18 | was incorrectly requesting the forward in both the control master and | 18 | was incorrectly requesting the forward in both the control master and |
19 | slave. skip requesting it in the master to fix. ok markus@ | 19 | slave. skip requesting it in the master to fix. ok markus@ |
20 | - djm@cvs.openbsd.org 2011/10/24 02:13:13 | ||
21 | [session.c] | ||
22 | bz#1859: send tty break to pty master instead of (probably already | ||
23 | closed) slave side; "looks good" markus@ | ||
20 | 24 | ||
21 | 20111025 | 25 | 20111025 |
22 | - (dtucker) [contrib/cygwin/Makefile] Continue if installing a doc file | 26 | - (dtucker) [contrib/cygwin/Makefile] Continue if installing a doc file |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: session.c,v 1.258 2010/11/25 04:10:09 djm Exp $ */ | 1 | /* $OpenBSD: session.c,v 1.259 2011/10/24 02:13:13 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 3 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
4 | * All rights reserved | 4 | * All rights reserved |
@@ -2166,7 +2166,7 @@ session_break_req(Session *s) | |||
2166 | packet_get_int(); /* ignored */ | 2166 | packet_get_int(); /* ignored */ |
2167 | packet_check_eom(); | 2167 | packet_check_eom(); |
2168 | 2168 | ||
2169 | if (s->ttyfd == -1 || tcsendbreak(s->ttyfd, 0) < 0) | 2169 | if (s->ptymaster == -1 || tcsendbreak(s->ptymaster, 0) < 0) |
2170 | return 0; | 2170 | return 0; |
2171 | return 1; | 2171 | return 1; |
2172 | } | 2172 | } |