- 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@
This commit is contained in:
Darren Tucker 2011-11-04 10:55:24 +11:00
parent 2d6665d944
commit 9c5d553d58
2 changed files with 6 additions and 2 deletions

View File

@ -17,6 +17,10 @@
bz#1943: unbreak stdio forwarding when ControlPersist is in user - ssh bz#1943: unbreak stdio forwarding when ControlPersist is in user - ssh
was incorrectly requesting the forward in both the control master and was incorrectly requesting the forward in both the control master and
slave. skip requesting it in the master to fix. ok markus@ 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 20111025
- (dtucker) [contrib/cygwin/Makefile] Continue if installing a doc file - (dtucker) [contrib/cygwin/Makefile] Continue if installing a doc file

View 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 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
* All rights reserved * All rights reserved
@ -2166,7 +2166,7 @@ session_break_req(Session *s)
packet_get_int(); /* ignored */ packet_get_int(); /* ignored */
packet_check_eom(); packet_check_eom();
if (s->ttyfd == -1 || tcsendbreak(s->ttyfd, 0) < 0) if (s->ptymaster == -1 || tcsendbreak(s->ptymaster, 0) < 0)
return 0; return 0;
return 1; return 1;
} }