Skip to content

Commit d80991f

Browse files
author
Lucas RAVAGNIER
committed
Add: Include sshd_config.d drop-in directory in sshd_config
During the last XenServer import, we overlooked the fact that user configurations were no longer being applied. This change aims to restore that setting. Report: https://xcp-ng.org/forum/topic/12397/change-default-ssh-port Signed-off-by: Lucas RAVAGNIER <lucas.ravagnier@vates.tech>
1 parent 0fbcbf1 commit d80991f

2 files changed

Lines changed: 9 additions & 1 deletion

File tree

SOURCES/sshd_config

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010
# possible, but leave them commented. Uncommented options override the
1111
# default value.
1212

13+
# To modify the system-wide sshd configuration, create *.conf file(s) under
14+
# /etc/ssh/sshd_config.d/ which will be automatically included below
15+
Include /etc/ssh/sshd_config.d/*.conf
16+
1317
#Port 22
1418
#AddressFamily any
1519
#ListenAddress 0.0.0.0

SPECS/openssh.spec

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# start the release from openssh_rel as other packages requires
66

77
# XCP-ng sub release number
8-
%define xcpng_subrel 5
8+
%define xcpng_subrel 6
99

1010
%global WITH_SELINUX 0
1111

@@ -518,6 +518,10 @@ cat %{_sysconfdir}/ssh/ssh_config.dup > %{_sysconfdir}/ssh/ssh_config
518518
%endif
519519

520520
%changelog
521+
* Mon Aug 10 2026 Lucas Ravagnier <lucas.ravagnier@vates.tech> - 9.8p1-1.2.6
522+
- Add "Include /etc/ssh/sshd_config.d/*.conf" to sshd_config so drop-in
523+
files placed in /etc/ssh/sshd_config.d/ will be loaded by sshd.
524+
521525
* Wed Jul 15 2026 Lucas Ravagnier <lucas.ravagnier@vates.tech> - 9.8p1-1.2.5
522526
- Fix CVE-2025-32728 (X11 and agent forwarding were not disabled by the
523527
DisableForwarding option due to a logic error)

0 commit comments

Comments
 (0)