diff options
| author | Colin Watson <cjwatson@debian.org> | 2019-04-08 10:46:29 +0100 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2020-02-21 14:45:21 +0000 |
| commit | 86fe78ef4686485394b464cf9d3393ce27b33979 (patch) | |
| tree | fadf469c312f899b97f5a5addcae2912aa1cf67b /servconf.c | |
| parent | 39d3bb41ec288e8ba2384c65248440603f65349c (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 'servconf.c')
| -rw-r--r-- | servconf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/servconf.c b/servconf.c index 7bbc25c2e..470ad3619 100644 --- a/servconf.c +++ b/servconf.c | |||
| @@ -452,9 +452,9 @@ fill_default_server_options(ServerOptions *options) | |||
| 452 | if (options->permit_tun == -1) | 452 | if (options->permit_tun == -1) |
| 453 | options->permit_tun = SSH_TUNMODE_NO; | 453 | options->permit_tun = SSH_TUNMODE_NO; |
| 454 | if (options->ip_qos_interactive == -1) | 454 | if (options->ip_qos_interactive == -1) |
| 455 | options->ip_qos_interactive = IPTOS_DSCP_AF21; | 455 | options->ip_qos_interactive = IPTOS_LOWDELAY; |
| 456 | if (options->ip_qos_bulk == -1) | 456 | if (options->ip_qos_bulk == -1) |
| 457 | options->ip_qos_bulk = IPTOS_DSCP_CS1; | 457 | options->ip_qos_bulk = IPTOS_THROUGHPUT; |
| 458 | if (options->version_addendum == NULL) | 458 | if (options->version_addendum == NULL) |
| 459 | options->version_addendum = xstrdup(""); | 459 | options->version_addendum = xstrdup(""); |
| 460 | if (options->fwd_opts.streamlocal_bind_mask == (mode_t)-1) | 460 | if (options->fwd_opts.streamlocal_bind_mask == (mode_t)-1) |