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 /servconf.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 'servconf.c')
| -rw-r--r-- | servconf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/servconf.c b/servconf.c index 8d2bced52..365e6ff1e 100644 --- a/servconf.c +++ b/servconf.c | |||
| @@ -423,9 +423,9 @@ fill_default_server_options(ServerOptions *options) | |||
| 423 | if (options->permit_tun == -1) | 423 | if (options->permit_tun == -1) |
| 424 | options->permit_tun = SSH_TUNMODE_NO; | 424 | options->permit_tun = SSH_TUNMODE_NO; |
| 425 | if (options->ip_qos_interactive == -1) | 425 | if (options->ip_qos_interactive == -1) |
| 426 | options->ip_qos_interactive = IPTOS_DSCP_AF21; | 426 | options->ip_qos_interactive = IPTOS_LOWDELAY; |
| 427 | if (options->ip_qos_bulk == -1) | 427 | if (options->ip_qos_bulk == -1) |
| 428 | options->ip_qos_bulk = IPTOS_DSCP_CS1; | 428 | options->ip_qos_bulk = IPTOS_THROUGHPUT; |
| 429 | if (options->version_addendum == NULL) | 429 | if (options->version_addendum == NULL) |
| 430 | options->version_addendum = xstrdup(""); | 430 | options->version_addendum = xstrdup(""); |
| 431 | if (options->fwd_opts.streamlocal_bind_mask == (mode_t)-1) | 431 | if (options->fwd_opts.streamlocal_bind_mask == (mode_t)-1) |