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 e676b6be6..c60df5602 100644 --- a/readconf.c +++ b/readconf.c | |||
@@ -2298,9 +2298,9 @@ fill_default_options(Options * options) | |||
2298 | if (options->visual_host_key == -1) | 2298 | if (options->visual_host_key == -1) |
2299 | options->visual_host_key = 0; | 2299 | options->visual_host_key = 0; |
2300 | if (options->ip_qos_interactive == -1) | 2300 | if (options->ip_qos_interactive == -1) |
2301 | options->ip_qos_interactive = IPTOS_DSCP_AF21; | 2301 | options->ip_qos_interactive = IPTOS_LOWDELAY; |
2302 | if (options->ip_qos_bulk == -1) | 2302 | if (options->ip_qos_bulk == -1) |
2303 | options->ip_qos_bulk = IPTOS_DSCP_CS1; | 2303 | options->ip_qos_bulk = IPTOS_THROUGHPUT; |
2304 | if (options->request_tty == -1) | 2304 | if (options->request_tty == -1) |
2305 | options->request_tty = REQUEST_TTY_AUTO; | 2305 | options->request_tty = REQUEST_TTY_AUTO; |
2306 | if (options->proxy_use_fdpass == -1) | 2306 | if (options->proxy_use_fdpass == -1) |
diff --git a/servconf.c b/servconf.c index f9eb778d6..98afcfcec 100644 --- a/servconf.c +++ b/servconf.c | |||
@@ -453,9 +453,9 @@ fill_default_server_options(ServerOptions *options) | |||
453 | if (options->permit_tun == -1) | 453 | if (options->permit_tun == -1) |
454 | options->permit_tun = SSH_TUNMODE_NO; | 454 | options->permit_tun = SSH_TUNMODE_NO; |
455 | if (options->ip_qos_interactive == -1) | 455 | if (options->ip_qos_interactive == -1) |
456 | options->ip_qos_interactive = IPTOS_DSCP_AF21; | 456 | options->ip_qos_interactive = IPTOS_LOWDELAY; |
457 | if (options->ip_qos_bulk == -1) | 457 | if (options->ip_qos_bulk == -1) |
458 | options->ip_qos_bulk = IPTOS_DSCP_CS1; | 458 | options->ip_qos_bulk = IPTOS_THROUGHPUT; |
459 | if (options->version_addendum == NULL) | 459 | if (options->version_addendum == NULL) |
460 | options->version_addendum = xstrdup(""); | 460 | options->version_addendum = xstrdup(""); |
461 | if (options->fwd_opts.streamlocal_bind_mask == (mode_t)-1) | 461 | if (options->fwd_opts.streamlocal_bind_mask == (mode_t)-1) |
diff --git a/ssh_config.5 b/ssh_config.5 index 6d6c59521..080d289a7 100644 --- a/ssh_config.5 +++ b/ssh_config.5 | |||
@@ -1156,11 +1156,9 @@ If one argument is specified, it is used as the packet class unconditionally. | |||
1156 | If two values are specified, the first is automatically selected for | 1156 | If two values are specified, the first is automatically selected for |
1157 | interactive sessions and the second for non-interactive sessions. | 1157 | interactive sessions and the second for non-interactive sessions. |
1158 | The default is | 1158 | The default is |
1159 | .Cm af21 | 1159 | .Cm lowdelay |
1160 | (Low-Latency Data) | ||
1161 | for interactive sessions and | 1160 | for interactive sessions and |
1162 | .Cm cs1 | 1161 | .Cm throughput |
1163 | (Lower Effort) | ||
1164 | for non-interactive sessions. | 1162 | for non-interactive sessions. |
1165 | .It Cm KbdInteractiveAuthentication | 1163 | .It Cm KbdInteractiveAuthentication |
1166 | Specifies whether to use keyboard-interactive authentication. | 1164 | Specifies whether to use keyboard-interactive authentication. |
diff --git a/sshd_config.5 b/sshd_config.5 index 472001dd1..a555e7ec3 100644 --- a/sshd_config.5 +++ b/sshd_config.5 | |||
@@ -925,11 +925,9 @@ If one argument is specified, it is used as the packet class unconditionally. | |||
925 | If two values are specified, the first is automatically selected for | 925 | If two values are specified, the first is automatically selected for |
926 | interactive sessions and the second for non-interactive sessions. | 926 | interactive sessions and the second for non-interactive sessions. |
927 | The default is | 927 | The default is |
928 | .Cm af21 | 928 | .Cm lowdelay |
929 | (Low-Latency Data) | ||
930 | for interactive sessions and | 929 | for interactive sessions and |
931 | .Cm cs1 | 930 | .Cm throughput |
932 | (Lower Effort) | ||
933 | for non-interactive sessions. | 931 | for non-interactive sessions. |
934 | .It Cm KbdInteractiveAuthentication | 932 | .It Cm KbdInteractiveAuthentication |
935 | Specifies whether to allow keyboard-interactive authentication. | 933 | Specifies whether to allow keyboard-interactive authentication. |