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 204f524..c371708 100644
--- a/debian/patches/revert-ipqos-defaults.patch
+++ b/debian/patches/revert-ipqos-defaults.patch
@@ -1,4 +1,4 @@
-From fc28a869ee5cedb1122d6171049fd3373e74a169 Mon Sep 17 00:00:00 2001
+From 24c6df47a8a17754e4d23fd4331c3fb35290a09d 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 2e6d3e726..95517f15f 100644
+index 720062bcc..f1d4566e2 100644
--- a/readconf.c
+++ b/readconf.c
-@@ -2852,9 +2852,9 @@ fill_default_options(Options * options)
+@@ -2891,9 +2891,9 @@ fill_default_options(Options * options)
if (options->visual_host_key == -1)
options->visual_host_key = 0;
if (options->ip_qos_interactive == -1)
@@ -40,7 +40,7 @@ index 2e6d3e726..95517f15f 100644
options->request_tty = REQUEST_TTY_AUTO;
if (options->session_type == -1)
diff --git a/servconf.c b/servconf.c
-index cecbef9a1..ab6198e6e 100644
+index 12aa1f4ad..23828a62d 100644
--- a/servconf.c
+++ b/servconf.c
@@ -439,9 +439,9 @@ fill_default_server_options(ServerOptions *options)
@@ -56,10 +56,10 @@ index cecbef9a1..ab6198e6e 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 4ec34d1a3..fe144ce29 100644
+index c2789a09d..a793b1ddb 100644
--- a/ssh_config.5
+++ b/ssh_config.5
-@@ -1313,11 +1313,9 @@ If one argument is specified, it is used as the packet class unconditionally.
+@@ -1323,11 +1323,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,10 +74,10 @@ index 4ec34d1a3..fe144ce29 100644
.It Cm KbdInteractiveAuthentication
Specifies whether to use keyboard-interactive authentication.
diff --git a/sshd_config.5 b/sshd_config.5
-index d0bf6d641..7cc68f4d4 100644
+index 12083e839..beb12acef 100644
--- a/sshd_config.5
+++ b/sshd_config.5
-@@ -1014,11 +1014,9 @@ If one argument is specified, it is used as the packet class unconditionally.
+@@ -1022,11 +1022,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