2 files changed, 7 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 6cfd29423..e5e81e9cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,11 @@
      [sshconnect.c]
      fix terminology: we didn't find a certificate in known_hosts, we found
      a CA key
+   - 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@
 
 20100410
  - (dtucker) [configure.ac] Put the check for the existence of getaddrinfo
diff --git a/clientloop.c b/clientloop.c
index 9ab56b44c..76de37213 100644
--- a/clientloop.c
+++ b/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
@@ -1912,7 +1912,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);