!148 [sync] PR-116: openssh：include 文件sshd_config.d/*.conf

From: @duyiwei7w 
Reviewed-by: @seuzw 
Signed-off-by: @seuzw

openssh.spec

@@ -6,7 +6,7 @@
 %{?no_gtk2:%global gtk2 0}
 
 %global sshd_uid    74
-%global openssh_release 8
+%global openssh_release 9
 
 Name:           openssh
 Version:        8.8p1
@@ -434,6 +434,12 @@ getent passwd sshd >/dev/null || \
 %attr(0644,root,root) %{_mandir}/man8/sftp-server.8*
 
 %changelog
+* Wed Dec 7 2022 duyiwei<duyiwei@kylinos.cn> - 8.8P1-9
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC:enable "include /etc/ssh/sshd_config.d/*.config" again
+
 * Mon Nov 28 2022 renmingshuai<renmingshuai@huawei.com> - 8.8p1-8
 - Type:bugfix
 - CVE:NA

set-sshd-config.patch

@@ -11,16 +11,7 @@ Index: b/sshd_config
 ===================================================================
 --- a/sshd_config
 +++ b/sshd_config
-@@ -12,7 +12,7 @@
+@@ -23,21 +23,22 @@
- 
- # To modify the system-wide sshd configuration, create a  *.conf  file under
- #  /etc/ssh/sshd_config.d/  which will be automatically included below
--Include /etc/ssh/sshd_config.d/*.conf
-+#Include /etc/ssh/sshd_config.d/*.conf
- 
- # If you want to change the port on a SELinux system, you have to tell
- # SELinux about this change.
-@@ -23,21 +23,22 @@ Include /etc/ssh/sshd_config.d/*.conf
  #ListenAddress 0.0.0.0
  #ListenAddress ::