summaryrefslogtreecommitdiffstats
path: root/debian/patches/revert-ipqos-defaults.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches/revert-ipqos-defaults.patch')
-rw-r--r--debian/patches/revert-ipqos-defaults.patch16
1 files changed, 8 insertions, 8 deletions
diff --git a/debian/patches/revert-ipqos-defaults.patch b/debian/patches/revert-ipqos-defaults.patch
index 2758571..0ad35c6 100644
--- a/debian/patches/revert-ipqos-defaults.patch
+++ b/debian/patches/revert-ipqos-defaults.patch
@@ -1,4 +1,4 @@
-From 91663a43be78a3b33c0cc055033d648269a4f98c Mon Sep 17 00:00:00 2001
+From 5fefa8a7853e96cb7a143432690212f4d1fbfc1a Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@debian.org>
Date: Mon, 8 Apr 2019 10:46:29 +0100
Subject: Revert "upstream: Update default IPQoS in ssh(1), sshd(8) to DSCP
@@ -24,10 +24,10 @@ Patch-Name: revert-ipqos-defaults.patch
4 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/readconf.c b/readconf.c
-index 1b64b7af5..a60aed047 100644
+index 90bf74f32..a321e6d8f 100644
--- a/readconf.c
+++ b/readconf.c
-@@ -2891,9 +2891,9 @@ fill_default_options(Options * options)
+@@ -2925,9 +2925,9 @@ fill_default_options(Options * options)
if (options->visual_host_key == -1)
options->visual_host_key = 0;
if (options->ip_qos_interactive == -1)
@@ -40,10 +40,10 @@ index 1b64b7af5..a60aed047 100644
options->request_tty = REQUEST_TTY_AUTO;
if (options->session_type == -1)
diff --git a/servconf.c b/servconf.c
-index 81511bc86..86c798b34 100644
+index 49a066df8..3c7ca3287 100644
--- a/servconf.c
+++ b/servconf.c
-@@ -479,9 +479,9 @@ fill_default_server_options(ServerOptions *options)
+@@ -483,9 +483,9 @@ fill_default_server_options(ServerOptions *options)
if (options->permit_tun == -1)
options->permit_tun = SSH_TUNMODE_NO;
if (options->ip_qos_interactive == -1)
@@ -56,10 +56,10 @@ index 81511bc86..86c798b34 100644
options->version_addendum = xstrdup("");
if (options->fwd_opts.streamlocal_bind_mask == (mode_t)-1)
diff --git a/ssh_config.5 b/ssh_config.5
-index 091b933b4..98a2ef60b 100644
+index 9adc0fdb7..14042dce5 100644
--- a/ssh_config.5
+++ b/ssh_config.5
-@@ -1322,11 +1322,9 @@ If one argument is specified, it is used as the packet class unconditionally.
+@@ -1329,11 +1329,9 @@ If one argument is specified, it is used as the packet class unconditionally.
If two values are specified, the first is automatically selected for
interactive sessions and the second for non-interactive sessions.
The default is
@@ -74,7 +74,7 @@ index 091b933b4..98a2ef60b 100644
.It Cm KbdInteractiveAuthentication
Specifies whether to use keyboard-interactive authentication.
diff --git a/sshd_config.5 b/sshd_config.5
-index 1f6c42523..1edd6c812 100644
+index 2887ed531..70d57bfdb 100644
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -1022,11 +1022,9 @@ If one argument is specified, it is used as the packet class unconditionally.