gentoo-ebuilds/net-misc/openssh-contrib/files/openssh-9.7_p1-config-tweaks.patch
James Le Cuirot 839c2c622c
net-misc/openssh*: Use patch to fix Include and move Subsystem config
- Put the Include option before options that introduce conditional
  blocks to avoid having the drop-in files to be included
  conditionally. For client configs the options that introduce such
  blocks are Match and Host options, for daemon configs it is the
  Match option.

- Move the Subsystem option out of the top-level daemon config into a
  separate drop-in. That way we can add the drop-in into INSTALL_MASK
  if we want to provide custom drop-in with a different settings for
  subsystems. This is necessary as there is no way to override a
  once-specified subsystem - doing so results in daemon printing an
  error and quitting.

Closes: https://bugs.gentoo.org/907068
Closes: https://github.com/gentoo/gentoo/pull/31615
Signed-off-by: James Le Cuirot <chewi@gentoo.org>
2024-06-10 17:35:58 +01:00

27 lines
1 KiB
Diff

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