diff options
author | Damien Miller <djm@mindrot.org> | 2010-04-16 15:53:23 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2010-04-16 15:53:23 +1000 |
commit | 22c97f1539816e2df00e91d023243b7d8d67a557 (patch) | |
tree | 4d1a15d83493180b11b4684e11ed14d98a2feeec /clientloop.c | |
parent | 672839994eaadecc95f3fada1cf014487631f068 (diff) |
- djm@cvs.openbsd.org 2010/04/10 02:08:44
[clientloop.c]
bz#1698: kill channel when pty allocation requests fail. Fixed
stuck client if the server refuses pty allocation.
ok dtucker@ "think so" markus@
Diffstat (limited to 'clientloop.c')
-rw-r--r-- | clientloop.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/clientloop.c b/clientloop.c index 9ab56b44c..76de37213 100644 --- a/clientloop.c +++ b/clientloop.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: clientloop.c,v 1.219 2010/03/13 21:10:38 djm Exp $ */ | 1 | /* $OpenBSD: clientloop.c,v 1.220 2010/04/10 02:08:44 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -1912,7 +1912,7 @@ client_session2_setup(int id, int want_tty, int want_subsystem, | |||
1912 | memset(&ws, 0, sizeof(ws)); | 1912 | memset(&ws, 0, sizeof(ws)); |
1913 | 1913 | ||
1914 | channel_request_start(id, "pty-req", 1); | 1914 | channel_request_start(id, "pty-req", 1); |
1915 | client_expect_confirm(id, "PTY allocation", 0); | 1915 | client_expect_confirm(id, "PTY allocation", 1); |
1916 | packet_put_cstring(term != NULL ? term : ""); | 1916 | packet_put_cstring(term != NULL ? term : ""); |
1917 | packet_put_int((u_int)ws.ws_col); | 1917 | packet_put_int((u_int)ws.ws_col); |
1918 | packet_put_int((u_int)ws.ws_row); | 1918 | packet_put_int((u_int)ws.ws_row); |