summaryrefslogtreecommitdiff
path: root/net-misc/openssh/files/openssh-9.7_p1-config-tweaks.patch
diff options
context:
space:
mode:
Diffstat (limited to 'net-misc/openssh/files/openssh-9.7_p1-config-tweaks.patch')
-rw-r--r--net-misc/openssh/files/openssh-9.7_p1-config-tweaks.patch27
1 files changed, 27 insertions, 0 deletions
diff --git a/net-misc/openssh/files/openssh-9.7_p1-config-tweaks.patch b/net-misc/openssh/files/openssh-9.7_p1-config-tweaks.patch
new file mode 100644
index 000000000000..229f7484cff5
--- /dev/null
+++ b/net-misc/openssh/files/openssh-9.7_p1-config-tweaks.patch
@@ -0,0 +1,27 @@
+diff -Naur a/ssh_config b/ssh_config
+--- a/ssh_config 2024-03-11 05:20:49.000000000 +0000
++++ b/ssh_config 2024-06-10 16:30:15.863023773 +0100
+@@ -13,6 +13,9 @@
+ # Thus, host-specific definitions should be at the beginning of the
+ # configuration file, and defaults at the end.
+
++# Make sure that all Host and Match options are below this Include!
++Include "/etc/ssh/ssh_config.d/*.conf"
++
+ # Site-wide defaults for some commonly used options. For a comprehensive
+ # list of available options, their meanings and defaults, please see the
+ # ssh_config(5) man page.
+diff -Naur a/sshd_config b/sshd_config
+--- a/sshd_config 2024-06-10 16:19:01.530491925 +0100
++++ b/sshd_config 2024-06-10 16:32:49.766386759 +0100
+@@ -105,8 +105,8 @@
+ # no default banner path
+ #Banner none
+
+-# override default of no subsystems
+-Subsystem sftp /usr/libexec/sftp-server
++# Make sure that all Match options are below this Include!
++Include "/etc/ssh/sshd_config.d/*.conf"
+
+ # Example of overriding settings on a per-user basis
+ #Match User anoncvs