diff options
| author | Colin Watson <cjwatson@debian.org> | 2019-04-08 10:46:29 +0100 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2019-06-21 16:14:04 +0100 |
| commit | f08fbfbaad10ae0bd9f057de8e18071e588146a6 (patch) | |
| tree | 088d074bb49a033efc958507d85ec56efe790a27 /readconf.c | |
| parent | a20835ce2f9899305421bc478ba29d6524e89433 (diff) | |
Revert "upstream: Update default IPQoS in ssh(1), sshd(8) to DSCP AF21 for"
This reverts commit 5ee8448ad7c306f05a9f56769f95336a8269f379.
The IPQoS default changes have some unfortunate interactions with
iptables (see https://bugs.debian.org/923880) and VMware, so I'm
temporarily reverting them until those have been fixed.
Bug-Debian: https://bugs.debian.org/923879
Bug-Debian: https://bugs.debian.org/926229
Bug-Ubuntu: https://bugs.launchpad.net/1822370
Last-Update: 2019-04-08
Patch-Name: revert-ipqos-defaults.patch
Diffstat (limited to 'readconf.c')
| -rw-r--r-- | readconf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/readconf.c b/readconf.c index f35bde6e6..2ba312441 100644 --- a/readconf.c +++ b/readconf.c | |||
| @@ -2165,9 +2165,9 @@ fill_default_options(Options * options) | |||
| 2165 | if (options->visual_host_key == -1) | 2165 | if (options->visual_host_key == -1) |
| 2166 | options->visual_host_key = 0; | 2166 | options->visual_host_key = 0; |
| 2167 | if (options->ip_qos_interactive == -1) | 2167 | if (options->ip_qos_interactive == -1) |
| 2168 | options->ip_qos_interactive = IPTOS_DSCP_AF21; | 2168 | options->ip_qos_interactive = IPTOS_LOWDELAY; |
| 2169 | if (options->ip_qos_bulk == -1) | 2169 | if (options->ip_qos_bulk == -1) |
| 2170 | options->ip_qos_bulk = IPTOS_DSCP_CS1; | 2170 | options->ip_qos_bulk = IPTOS_THROUGHPUT; |
| 2171 | if (options->request_tty == -1) | 2171 | if (options->request_tty == -1) |
| 2172 | options->request_tty = REQUEST_TTY_AUTO; | 2172 | options->request_tty = REQUEST_TTY_AUTO; |
| 2173 | if (options->proxy_use_fdpass == -1) | 2173 | if (options->proxy_use_fdpass == -1) |