diff options
| author | Colin Watson <cjwatson@debian.org> | 2019-04-08 10:46:29 +0100 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2020-06-07 10:25:35 +0100 |
| commit | 39b8d128ef980a410bb1ea0ee80e95ac9fff59c3 (patch) | |
| tree | 8f4b2d0795835960f2591d0555a507e007c843ec /readconf.c | |
| parent | f2697f0c5ff23bc13dce1c90fb4c1c934c02070b (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 87b0dc62a..9a646dcaa 100644 --- a/readconf.c +++ b/readconf.c | |||
| @@ -2254,9 +2254,9 @@ fill_default_options(Options * options) | |||
| 2254 | if (options->visual_host_key == -1) | 2254 | if (options->visual_host_key == -1) |
| 2255 | options->visual_host_key = 0; | 2255 | options->visual_host_key = 0; |
| 2256 | if (options->ip_qos_interactive == -1) | 2256 | if (options->ip_qos_interactive == -1) |
| 2257 | options->ip_qos_interactive = IPTOS_DSCP_AF21; | 2257 | options->ip_qos_interactive = IPTOS_LOWDELAY; |
| 2258 | if (options->ip_qos_bulk == -1) | 2258 | if (options->ip_qos_bulk == -1) |
| 2259 | options->ip_qos_bulk = IPTOS_DSCP_CS1; | 2259 | options->ip_qos_bulk = IPTOS_THROUGHPUT; |
| 2260 | if (options->request_tty == -1) | 2260 | if (options->request_tty == -1) |
| 2261 | options->request_tty = REQUEST_TTY_AUTO; | 2261 | options->request_tty = REQUEST_TTY_AUTO; |
| 2262 | if (options->proxy_use_fdpass == -1) | 2262 | if (options->proxy_use_fdpass == -1) |