diff options
-rw-r--r-- | readconf.c | 4 | ||||
-rw-r--r-- | servconf.c | 4 | ||||
-rw-r--r-- | ssh_config.5 | 6 | ||||
-rw-r--r-- | sshd_config.5 | 6 |
4 files changed, 8 insertions, 12 deletions
diff --git a/readconf.c b/readconf.c index 661b8bf40..6d046f063 100644 --- a/readconf.c +++ b/readconf.c | |||
@@ -2133,9 +2133,9 @@ fill_default_options(Options * options) | |||
2133 | if (options->visual_host_key == -1) | 2133 | if (options->visual_host_key == -1) |
2134 | options->visual_host_key = 0; | 2134 | options->visual_host_key = 0; |
2135 | if (options->ip_qos_interactive == -1) | 2135 | if (options->ip_qos_interactive == -1) |
2136 | options->ip_qos_interactive = IPTOS_DSCP_AF21; | 2136 | options->ip_qos_interactive = IPTOS_LOWDELAY; |
2137 | if (options->ip_qos_bulk == -1) | 2137 | if (options->ip_qos_bulk == -1) |
2138 | options->ip_qos_bulk = IPTOS_DSCP_CS1; | 2138 | options->ip_qos_bulk = IPTOS_THROUGHPUT; |
2139 | if (options->request_tty == -1) | 2139 | if (options->request_tty == -1) |
2140 | options->request_tty = REQUEST_TTY_AUTO; | 2140 | options->request_tty = REQUEST_TTY_AUTO; |
2141 | if (options->proxy_use_fdpass == -1) | 2141 | if (options->proxy_use_fdpass == -1) |
diff --git a/servconf.c b/servconf.c index c5dd617ef..bf2669147 100644 --- a/servconf.c +++ b/servconf.c | |||
@@ -403,9 +403,9 @@ fill_default_server_options(ServerOptions *options) | |||
403 | if (options->permit_tun == -1) | 403 | if (options->permit_tun == -1) |
404 | options->permit_tun = SSH_TUNMODE_NO; | 404 | options->permit_tun = SSH_TUNMODE_NO; |
405 | if (options->ip_qos_interactive == -1) | 405 | if (options->ip_qos_interactive == -1) |
406 | options->ip_qos_interactive = IPTOS_DSCP_AF21; | 406 | options->ip_qos_interactive = IPTOS_LOWDELAY; |
407 | if (options->ip_qos_bulk == -1) | 407 | if (options->ip_qos_bulk == -1) |
408 | options->ip_qos_bulk = IPTOS_DSCP_CS1; | 408 | options->ip_qos_bulk = IPTOS_THROUGHPUT; |
409 | if (options->version_addendum == NULL) | 409 | if (options->version_addendum == NULL) |
410 | options->version_addendum = xstrdup(""); | 410 | options->version_addendum = xstrdup(""); |
411 | if (options->fwd_opts.streamlocal_bind_mask == (mode_t)-1) | 411 | if (options->fwd_opts.streamlocal_bind_mask == (mode_t)-1) |
diff --git a/ssh_config.5 b/ssh_config.5 index 1a8e24bd1..f6c1b3b33 100644 --- a/ssh_config.5 +++ b/ssh_config.5 | |||
@@ -1055,11 +1055,9 @@ If one argument is specified, it is used as the packet class unconditionally. | |||
1055 | If two values are specified, the first is automatically selected for | 1055 | If two values are specified, the first is automatically selected for |
1056 | interactive sessions and the second for non-interactive sessions. | 1056 | interactive sessions and the second for non-interactive sessions. |
1057 | The default is | 1057 | The default is |
1058 | .Cm af21 | 1058 | .Cm lowdelay |
1059 | (Low-Latency Data) | ||
1060 | for interactive sessions and | 1059 | for interactive sessions and |
1061 | .Cm cs1 | 1060 | .Cm throughput |
1062 | (Lower Effort) | ||
1063 | for non-interactive sessions. | 1061 | for non-interactive sessions. |
1064 | .It Cm KbdInteractiveAuthentication | 1062 | .It Cm KbdInteractiveAuthentication |
1065 | Specifies whether to use keyboard-interactive authentication. | 1063 | Specifies whether to use keyboard-interactive authentication. |
diff --git a/sshd_config.5 b/sshd_config.5 index ba50a30f1..03f813e72 100644 --- a/sshd_config.5 +++ b/sshd_config.5 | |||
@@ -866,11 +866,9 @@ If one argument is specified, it is used as the packet class unconditionally. | |||
866 | If two values are specified, the first is automatically selected for | 866 | If two values are specified, the first is automatically selected for |
867 | interactive sessions and the second for non-interactive sessions. | 867 | interactive sessions and the second for non-interactive sessions. |
868 | The default is | 868 | The default is |
869 | .Cm af21 | 869 | .Cm lowdelay |
870 | (Low-Latency Data) | ||
871 | for interactive sessions and | 870 | for interactive sessions and |
872 | .Cm cs1 | 871 | .Cm throughput |
873 | (Lower Effort) | ||
874 | for non-interactive sessions. | 872 | for non-interactive sessions. |
875 | .It Cm KbdInteractiveAuthentication | 873 | .It Cm KbdInteractiveAuthentication |
876 | Specifies whether to allow keyboard-interactive authentication. | 874 | Specifies whether to allow keyboard-interactive authentication. |