===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/ssh.c,v
retrieving revision 1.378
retrieving revision 1.379
diff -u -r1.378 -r1.379
--- src/usr.bin/ssh/ssh.c	2013/05/17 00:13:14	1.378
+++ src/usr.bin/ssh/ssh.c	2013/07/12 05:48:55	1.379
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.378 2013/05/17 00:13:14 djm Exp $ */
+/* $OpenBSD: ssh.c,v 1.379 2013/07/12 05:48:55 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1429,6 +1429,11 @@
 
 	if (!no_shell_flag || (datafellows & SSH_BUG_DUMMYCHAN))
 		id = ssh_session2_open();
+	else {
+		packet_set_interactive(
+		    options.control_master == SSHCTL_MASTER_NO,
+		    options.ip_qos_interactive, options.ip_qos_bulk);
+	}
 
 	/* If we don't expect to open a new session, then disallow it */
 	if (options.control_master == SSHCTL_MASTER_NO &&