diff options
author | dtucker <dtucker> | 2011-11-03 23:55:24 +0000 |
---|---|---|
committer | dtucker <dtucker> | 2011-11-03 23:55:24 +0000 |
commit | bb8171827fb18805799041df08c6e0d42cfb5891 (patch) | |
tree | c663b937c48300e85bb10312347eca2d5804a6eb | |
parent | eb921c5915b6522de4fcef7cbc8d6f2b2f89c678 (diff) | |
download | openssh-bb8171827fb18805799041df08c6e0d42cfb5891.tar.gz |
- 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 @@ bz#1943: unbreak stdio forwarding when ControlPersist is in user - ssh was incorrectly requesting the forward in both the control master and slave. skip requesting it in the master to fix. ok markus@ + - 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@ 20111025 - (dtucker) [contrib/cygwin/Makefile] Continue if installing a doc file @@ -1,4 +1,4 @@ -/* $OpenBSD: session.c,v 1.258 2010/11/25 04:10:09 djm Exp $ */ +/* $OpenBSD: session.c,v 1.259 2011/10/24 02:13:13 djm Exp $ */ /* * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * All rights reserved @@ -2166,7 +2166,7 @@ session_break_req(Session *s) packet_get_int(); /* ignored */ packet_check_eom(); - if (s->ttyfd == -1 || tcsendbreak(s->ttyfd, 0) < 0) + if (s->ptymaster == -1 || tcsendbreak(s->ptymaster, 0) < 0) return 0; return 1; } |