- 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@

2 files changed, 6 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 3f38bb4a2..924649e8e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/session.c b/session.c
index 6a7040078..5dad26293 100644
--- a/session.c
+++ b/session.c
@@ -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;
 }