diff options
| author |   djm <djm@openbsd.org> | 2013-07-12 05:48:55 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2013-07-12 05:48:55 +0000 |
| commit | 0435de1447c85e522d950700b678988ec8ffbe57 (patch) | |
| tree | 3515ddb200f9724ff4bb4d2608ff9f61da4e136a /usr.bin/ssh/ssh.c | |
| parent | do_print_resource_record() can never be called with a NULL filename, so (diff) | |
| download | wireguard-openbsd-0435de1447c85e522d950700b678988ec8ffbe57.tar.xz wireguard-openbsd-0435de1447c85e522d950700b678988ec8ffbe57.zip | |
set TCP nodelay for connections started with -N; bz#2124 ok dtucker@
Diffstat (limited to 'usr.bin/ssh/ssh.c')
| -rw-r--r-- | usr.bin/ssh/ssh.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c index 386991ad428..d2ce49eabc9 100644 --- a/usr.bin/ssh/ssh.c +++ b/usr.bin/ssh/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 @@ -1429,6 +1429,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 && |