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 e82024678..1b9494d7c 100644 --- a/readconf.c +++ b/readconf.c | |||
@@ -2230,9 +2230,9 @@ fill_default_options(Options * options) | |||
2230 | if (options->visual_host_key == -1) | 2230 | if (options->visual_host_key == -1) |
2231 | options->visual_host_key = 0; | 2231 | options->visual_host_key = 0; |
2232 | if (options->ip_qos_interactive == -1) | 2232 | if (options->ip_qos_interactive == -1) |
2233 | options->ip_qos_interactive = IPTOS_DSCP_AF21; | 2233 | options->ip_qos_interactive = IPTOS_LOWDELAY; |
2234 | if (options->ip_qos_bulk == -1) | 2234 | if (options->ip_qos_bulk == -1) |
2235 | options->ip_qos_bulk = IPTOS_DSCP_CS1; | 2235 | options->ip_qos_bulk = IPTOS_THROUGHPUT; |
2236 | if (options->request_tty == -1) | 2236 | if (options->request_tty == -1) |
2237 | options->request_tty = REQUEST_TTY_AUTO; | 2237 | options->request_tty = REQUEST_TTY_AUTO; |
2238 | if (options->proxy_use_fdpass == -1) | 2238 | if (options->proxy_use_fdpass == -1) |
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) |
diff --git a/ssh_config.5 b/ssh_config.5 index 5c90d3e02..6b4e4f43b 100644 --- a/ssh_config.5 +++ b/ssh_config.5 | |||
@@ -1133,11 +1133,9 @@ If one argument is specified, it is used as the packet class unconditionally. | |||
1133 | If two values are specified, the first is automatically selected for | 1133 | If two values are specified, the first is automatically selected for |
1134 | interactive sessions and the second for non-interactive sessions. | 1134 | interactive sessions and the second for non-interactive sessions. |
1135 | The default is | 1135 | The default is |
1136 | .Cm af21 | 1136 | .Cm lowdelay |
1137 | (Low-Latency Data) | ||
1138 | for interactive sessions and | 1137 | for interactive sessions and |
1139 | .Cm cs1 | 1138 | .Cm throughput |
1140 | (Lower Effort) | ||
1141 | for non-interactive sessions. | 1139 | for non-interactive sessions. |
1142 | .It Cm KbdInteractiveAuthentication | 1140 | .It Cm KbdInteractiveAuthentication |
1143 | Specifies whether to use keyboard-interactive authentication. | 1141 | Specifies whether to use keyboard-interactive authentication. |
diff --git a/sshd_config.5 b/sshd_config.5 index b8bea2ad7..fd205e418 100644 --- a/sshd_config.5 +++ b/sshd_config.5 | |||
@@ -907,11 +907,9 @@ If one argument is specified, it is used as the packet class unconditionally. | |||
907 | If two values are specified, the first is automatically selected for | 907 | If two values are specified, the first is automatically selected for |
908 | interactive sessions and the second for non-interactive sessions. | 908 | interactive sessions and the second for non-interactive sessions. |
909 | The default is | 909 | The default is |
910 | .Cm af21 | 910 | .Cm lowdelay |
911 | (Low-Latency Data) | ||
912 | for interactive sessions and | 911 | for interactive sessions and |
913 | .Cm cs1 | 912 | .Cm throughput |
914 | (Lower Effort) | ||
915 | for non-interactive sessions. | 913 | for non-interactive sessions. |
916 | .It Cm KbdInteractiveAuthentication | 914 | .It Cm KbdInteractiveAuthentication |
917 | Specifies whether to allow keyboard-interactive authentication. | 915 | Specifies whether to allow keyboard-interactive authentication. |