Accepting request 997452 from network

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/997452
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openssh?expand=0&rev=157

openssh-8.4p1-ssh_config_d.patch

@@ -20,17 +20,21 @@ 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
-+
+@@ -5,10 +5,17 @@
+ 
+ # This sshd was compiled with PATH=/usr/bin:/bin:/usr/sbin:/sbin
+ 
 +# 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
++
+ # The strategy used for options in the default sshd_config shipped with
+ # 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
  
  #Port 22
  #AddressFamily any

openssh.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jul  6 12:15:29 UTC 2022 - Adam Majer <adam.majer@suse.de>
+
+- openssh-8.4p1-ssh_config_d.patch: admin overrides should take
+  priority (listed first) over package defaults
+
 -------------------------------------------------------------------
 Mon Mar 28 15:00:52 UTC 2022 - Ludwig Nussel <lnussel@suse.de>