summaryrefslogtreecommitdiff
path: root/ssh.c
diff options
context:
space:
mode:
Diffstat (limited to 'ssh.c')
-rw-r--r--ssh.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/ssh.c b/ssh.c
index 0e96c9219..a9b0a7086 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh.c,v 1.378 2013/05/17 00:13:14 djm Exp $ */ 1/* $OpenBSD: ssh.c,v 1.379 2013/07/12 05:48:55 djm Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1480,6 +1480,11 @@ ssh_session2(void)
1480 1480
1481 if (!no_shell_flag || (datafellows & SSH_BUG_DUMMYCHAN)) 1481 if (!no_shell_flag || (datafellows & SSH_BUG_DUMMYCHAN))
1482 id = ssh_session2_open(); 1482 id = ssh_session2_open();
1483 else {
1484 packet_set_interactive(
1485 options.control_master == SSHCTL_MASTER_NO,
1486 options.ip_qos_interactive, options.ip_qos_bulk);
1487 }
1483 1488
1484 /* If we don't expect to open a new session, then disallow it */ 1489 /* If we don't expect to open a new session, then disallow it */
1485 if (options.control_master == SSHCTL_MASTER_NO && 1490 if (options.control_master == SSHCTL_MASTER_NO &&