===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/mux.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- src/usr.bin/ssh/mux.c	2009/08/20 23:54:28	1.8
+++ src/usr.bin/ssh/mux.c	2010/01/09 05:04:24	1.9
@@ -1,4 +1,4 @@
-/* $OpenBSD: mux.c,v 1.8 2009/08/20 23:54:28 dtucker Exp $ */
+/* $OpenBSD: mux.c,v 1.9 2010/01/09 05:04:24 djm Exp $ */
 /*
  * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org>
  *
@@ -71,6 +71,7 @@
 
 /* from ssh.c */
 extern int tty_flag;
+extern int force_tty_flag;
 extern Options options;
 extern int stdin_null_flag;
 extern char *host;
@@ -671,7 +672,7 @@
 	signal(SIGWINCH, control_client_sigrelay);
 
 	if (tty_flag)
-		enter_raw_mode();
+		enter_raw_mode(force_tty_flag);
 
 	/*
 	 * Stick around until the controlee closes the client_fd.
@@ -696,7 +697,7 @@
 	}
 
 	close(sock);
-	leave_raw_mode();
+	leave_raw_mode(force_tty_flag);
 	if (i > (int)sizeof(int))
 		fatal("%s: master returned too much data (%d > %lu)",
 		    __func__, i, (u_long)sizeof(int));