summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2013-07-18 16:13:55 +1000
committerDamien Miller <djm@mindrot.org>2013-07-18 16:13:55 +1000
commit649fe025a409d0ce88c60a068f3f211193c35873 (patch)
tree0e016f24267baf5d304f9bca2527319cfeafe75d
parent5bb8833e809d827496dffca0dc2c223052c93931 (diff)
- djm@cvs.openbsd.org 2013/07/12 05:48:55
[ssh.c] set TCP nodelay for connections started with -N; bz#2124 ok dtucker@
-rw-r--r--ChangeLog3
-rw-r--r--ssh.c7
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2c025826..21d35b37 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -54,6 +54,9 @@
do_print_resource_record() can never be called with a NULL filename, so
don't attempt (and bungle) asking for one if it has not been specified
bz#2127 ok dtucker@
+ - djm@cvs.openbsd.org 2013/07/12 05:48:55
+ [ssh.c]
+ set TCP nodelay for connections started with -N; bz#2124 ok dtucker@
20130702
- (dtucker) [contrib/cygwin/README contrib/cygwin/ssh-host-config
diff --git a/ssh.c b/ssh.c
index 0e96c921..a9b0a708 100644
--- a/ssh.c
+++ b/ssh.c
@@ -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
@@ -1480,6 +1480,11 @@ ssh_session2(void)
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 &&