openssh/openssh-8.4p1-ssh_config_d.patch
Hans Petter Jansson 859cab66f6 Accepting request 965435 from home:lnussel:branches:network
- read ssh and sshd config file also from /usr/etc
- add openssh-server-config-rootlogin subpackage that enabled PermitRootLogin

OBS-URL: https://build.opensuse.org/request/show/965435
OBS-URL: https://build.opensuse.org/package/show/network/openssh?expand=0&rev=238
2022-04-29 00:45:48 +00:00

37 lines
1.4 KiB
Diff

Index: openssh-8.9p1/ssh_config
===================================================================
--- openssh-8.9p1.orig/ssh_config
+++ openssh-8.9p1/ssh_config
@@ -16,6 +16,13 @@
# 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.
+Include /usr/etc/ssh/ssh_config.d/*.conf
+
+# To modify the system-wide ssh configuration, create a "*.conf" file under
+# "/etc/ssh/ssh_config.d/" which will be automatically included below.
+# Don't edit this configuration file itself if possible to avoid update
+# problems.
+Include /etc/ssh/ssh_config.d/*.conf
Host *
# ForwardAgent no
Index: openssh-8.9p1/sshd_config
===================================================================
--- openssh-8.9p1.orig/sshd_config
+++ openssh-8.9p1/sshd_config
@@ -9,6 +9,13 @@
# OpenSSH is to specify options with their default value where
# possible, but leave them commented. Uncommented options override the
# default value.
+Include /usr/etc/ssh/sshd_config.d/*.conf
+
+# To modify the system-wide sshd configuration, create a "*.conf" file under
+# "/etc/ssh/sshd_config.d/" which will be automatically included below.
+# Don't edit this configuration file itself if possible to avoid update
+# problems.
+Include /etc/ssh/sshd_config.d/*.conf
#Port 22
#AddressFamily any