diff options
| author |   djm <djm@openbsd.org> | 2010-04-10 02:08:44 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2010-04-10 02:08:44 +0000 |
| commit | bf4ba7b0b5f24f03b971d54dce98cf6a92bfe6dc (patch) | |
| tree | f187594c94a87a05b55fee79f212ed173bc8e112 | |
| parent | fix terminology: we didn't find a certificate in known_hosts, we found (diff) | |
| download | wireguard-openbsd-bf4ba7b0b5f24f03b971d54dce98cf6a92bfe6dc.tar.xz wireguard-openbsd-bf4ba7b0b5f24f03b971d54dce98cf6a92bfe6dc.zip | |
bz#1698: kill channel when pty allocation requests fail. Fixed
stuck client if the server refuses pty allocation.
ok dtucker@ "think so" markus@
| -rw-r--r-- | usr.bin/ssh/clientloop.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/clientloop.c b/usr.bin/ssh/clientloop.c index c01aaf0b065..ff00211b909 100644 --- a/usr.bin/ssh/clientloop.c +++ b/usr.bin/ssh/clientloop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clientloop.c,v 1.219 2010/03/13 21:10:38 djm Exp $ */ +/* $OpenBSD: clientloop.c,v 1.220 2010/04/10 02:08:44 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1894,7 +1894,7 @@ client_session2_setup(int id, int want_tty, int want_subsystem, memset(&ws, 0, sizeof(ws)); channel_request_start(id, "pty-req", 1); - client_expect_confirm(id, "PTY allocation", 0); + client_expect_confirm(id, "PTY allocation", 1); packet_put_cstring(term != NULL ? term : ""); packet_put_int((u_int)ws.ws_col); packet_put_int((u_int)ws.ws_row); |