1 files changed, 13 insertions, 10 deletions

diff --git a/clientloop.c b/clientloop.c
index eca87777f..5793a6e91 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clientloop.c,v 1.215 2009/11/17 05:31:44 djm Exp $ */
+/* $OpenBSD: clientloop.c,v 1.216 2010/01/09 05:04:24 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -130,6 +130,9 @@ extern int muxserver_sock;
  */
 extern char *host;
 
+/* Force TTY allocation */
+extern int force_tty_flag;
+
 /*
  * Flag to indicate that we have received a window change signal which has
  * not yet been processed.  This will cause a message indicating the new
@@ -610,7 +613,7 @@ client_suspend_self(Buffer *bin, Buffer *bout, Buffer *berr)
                 atomicio(vwrite, fileno(stderr), buffer_ptr(berr),
                     buffer_len(berr));
 
-        leave_raw_mode();
+        leave_raw_mode(force_tty_flag);
 
         /*
          * Free (and clear) the buffer to reduce the amount of data that gets
@@ -631,7 +634,7 @@ client_suspend_self(Buffer *bin, Buffer *bout, Buffer *berr)
         buffer_init(bout);
         buffer_init(berr);
 
-        enter_raw_mode();
+        enter_raw_mode(force_tty_flag);
 }
 
 static void
@@ -774,7 +777,7 @@ process_cmdline(void)
         bzero(&fwd, sizeof(fwd));
         fwd.listen_host = fwd.connect_host = NULL;
 
-        leave_raw_mode();
+        leave_raw_mode(force_tty_flag);
         handler = signal(SIGINT, SIG_IGN);
         cmd = s = read_passphrase("\r\nssh> ", RP_ECHO);
         if (s == NULL)
@@ -877,7 +880,7 @@ process_cmdline(void)
 
 out:
         signal(SIGINT, handler);
-        enter_raw_mode();
+        enter_raw_mode(force_tty_flag);
         if (cmd)
                 xfree(cmd);
         if (fwd.listen_host != NULL)
@@ -996,7 +999,7 @@ process_escapes(Channel *c, Buffer *bin, Buffer *bout, Buffer *berr,
                                  * more new connections).
                                  */
                                 /* Restore tty modes. */
-                                leave_raw_mode();
+                                leave_raw_mode(force_tty_flag);
 
                                 /* Stop listening for new connections. */
                                 channel_stop_listening();
@@ -1291,7 +1294,7 @@ client_channel_closed(int id, void *arg)
 {
         channel_cancel_cleanup(id);
         session_closed = 1;
-        leave_raw_mode();
+        leave_raw_mode(force_tty_flag);
 }
 
 /*
@@ -1364,7 +1367,7 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id)
         signal(SIGWINCH, window_change_handler);
 
         if (have_pty)
-                enter_raw_mode();
+                enter_raw_mode(force_tty_flag);
 
         if (compat20) {
                 session_ident = ssh2_chan_id;
@@ -1498,7 +1501,7 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id)
         channel_free_all();
 
         if (have_pty)
-                leave_raw_mode();
+                leave_raw_mode(force_tty_flag);
 
         /* restore blocking io */
         if (!isatty(fileno(stdin)))
@@ -2062,7 +2065,7 @@ client_init_dispatch(void)
 void
 cleanup_exit(int i)
 {
-        leave_raw_mode();
+        leave_raw_mode(force_tty_flag);
         leave_non_blocking();
         if (options.control_path != NULL && muxserver_sock != -1)
                 unlink(options.control_path);