summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--readconf.c4
-rw-r--r--servconf.c4
-rw-r--r--ssh_config.56
-rw-r--r--sshd_config.56
4 files changed, 8 insertions, 12 deletions
diff --git a/readconf.c b/readconf.c
index 253574ce0..9812b8d98 100644
--- a/readconf.c
+++ b/readconf.c
@@ -2174,9 +2174,9 @@ fill_default_options(Options * options)
2174 if (options->visual_host_key == -1) 2174 if (options->visual_host_key == -1)
2175 options->visual_host_key = 0; 2175 options->visual_host_key = 0;
2176 if (options->ip_qos_interactive == -1) 2176 if (options->ip_qos_interactive == -1)
2177 options->ip_qos_interactive = IPTOS_DSCP_AF21; 2177 options->ip_qos_interactive = IPTOS_LOWDELAY;
2178 if (options->ip_qos_bulk == -1) 2178 if (options->ip_qos_bulk == -1)
2179 options->ip_qos_bulk = IPTOS_DSCP_CS1; 2179 options->ip_qos_bulk = IPTOS_THROUGHPUT;
2180 if (options->request_tty == -1) 2180 if (options->request_tty == -1)
2181 options->request_tty = REQUEST_TTY_AUTO; 2181 options->request_tty = REQUEST_TTY_AUTO;
2182 if (options->proxy_use_fdpass == -1) 2182 if (options->proxy_use_fdpass == -1)
diff --git a/servconf.c b/servconf.c
index 5576098a5..4464d51a5 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)
diff --git a/ssh_config.5 b/ssh_config.5
index d27655e15..b71d5ede9 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -1110,11 +1110,9 @@ If one argument is specified, it is used as the packet class unconditionally.
1110If two values are specified, the first is automatically selected for 1110If two values are specified, the first is automatically selected for
1111interactive sessions and the second for non-interactive sessions. 1111interactive sessions and the second for non-interactive sessions.
1112The default is 1112The default is
1113.Cm af21 1113.Cm lowdelay
1114(Low-Latency Data)
1115for interactive sessions and 1114for interactive sessions and
1116.Cm cs1 1115.Cm throughput
1117(Lower Effort)
1118for non-interactive sessions. 1116for non-interactive sessions.
1119.It Cm KbdInteractiveAuthentication 1117.It Cm KbdInteractiveAuthentication
1120Specifies whether to use keyboard-interactive authentication. 1118Specifies whether to use keyboard-interactive authentication.
diff --git a/sshd_config.5 b/sshd_config.5
index 02e29cb6f..ba533af9e 100644
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -892,11 +892,9 @@ If one argument is specified, it is used as the packet class unconditionally.
892If two values are specified, the first is automatically selected for 892If two values are specified, the first is automatically selected for
893interactive sessions and the second for non-interactive sessions. 893interactive sessions and the second for non-interactive sessions.
894The default is 894The default is
895.Cm af21 895.Cm lowdelay
896(Low-Latency Data)
897for interactive sessions and 896for interactive sessions and
898.Cm cs1 897.Cm throughput
899(Lower Effort)
900for non-interactive sessions. 898for non-interactive sessions.
901.It Cm KbdInteractiveAuthentication 899.It Cm KbdInteractiveAuthentication
902Specifies whether to allow keyboard-interactive authentication. 900Specifies whether to allow keyboard-interactive authentication.