diff options
| author | Colin Watson <cjwatson@debian.org> | 2019-04-08 10:46:29 +0100 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2019-10-22 11:05:47 +0100 |
| commit | cfa01c635debb10e05f5ac34d269809c77c582dc (patch) | |
| tree | 4888e5a45426bce467c9f571ccf6d9a8a7a4eb2b /readconf.c | |
| parent | bbce4380e516e8bfed1ae09af0bc3661e427794a (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/bugs/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 253574ce0..9812b8d98 100644 --- a/readconf.c +++ b/readconf.c | |||
| @@ -2174,9 +2174,9 @@ fill_default_options(Options * options) | |||
| 2174 | if (options->visual_host_key == -1) | 2174 | if (options->visual_host_key == -1) |
| 2175 | options->visual_host_key = 0; | 2175 | options->visual_host_key = 0; |
| 2176 | if (options->ip_qos_interactive == -1) | 2176 | if (options->ip_qos_interactive == -1) |
| 2177 | options->ip_qos_interactive = IPTOS_DSCP_AF21; | 2177 | options->ip_qos_interactive = IPTOS_LOWDELAY; |
| 2178 | if (options->ip_qos_bulk == -1) | 2178 | if (options->ip_qos_bulk == -1) |
| 2179 | options->ip_qos_bulk = IPTOS_DSCP_CS1; | 2179 | options->ip_qos_bulk = IPTOS_THROUGHPUT; |
| 2180 | if (options->request_tty == -1) | 2180 | if (options->request_tty == -1) |
| 2181 | options->request_tty = REQUEST_TTY_AUTO; | 2181 | options->request_tty = REQUEST_TTY_AUTO; |
| 2182 | if (options->proxy_use_fdpass == -1) | 2182 | if (options->proxy_use_fdpass == -1) |