diff options
author | Colin Watson <cjwatson@debian.org> | 2012-05-17 13:04:02 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2012-05-17 13:04:02 +0100 |
commit | dd5ed53e20d218607260916a6b04d1c8c5b3d88f (patch) | |
tree | c59b4dbcc610f10700945f885adf3bddc2542c26 /session.c | |
parent | 8241a65bf12ac53c1b7304bba7ce739aad80b8b8 (diff) | |
parent | b9bc38990c5eb5d99e28ca5af6d3491fd4a0060a (diff) |
merge 6.0p1
Diffstat (limited to 'session.c')
-rw-r--r-- | session.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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 | } |