From 653d073710be3c318b92455d6500bf8721fb6b42 Mon Sep 17 00:00:00 2001 From: Jakub Jelen Date: Wed, 10 Jun 2020 14:30:23 +0200 Subject: [PATCH] Move sshd_config include before any other definitions (#1824913) --- openssh-7.7p1-redhat.patch | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/openssh-7.7p1-redhat.patch b/openssh-7.7p1-redhat.patch index 1c48ac6..fe4200d 100644 --- a/openssh-7.7p1-redhat.patch +++ b/openssh-7.7p1-redhat.patch @@ -68,10 +68,14 @@ diff -up openssh/sshd_config.5.redhat openssh/sshd_config.5 diff -up openssh/sshd_config.redhat openssh/sshd_config --- openssh/sshd_config.redhat 2020-02-11 23:28:35.000000000 +0100 +++ openssh/sshd_config 2020-02-13 18:20:16.349913681 +0100 -@@ -10,6 +10,10 @@ +@@ -10,6 +10,14 @@ # possible, but leave them commented. Uncommented options override the # default value. - + ++# 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 ++ +# If you want to change the port on a SELinux system, you have to tell +# SELinux about this change. +# semanage port -a -t ssh_port_t -p tcp #PORTNUMBER @@ -79,14 +83,6 @@ diff -up openssh/sshd_config.redhat openssh/sshd_config #Port 22 #AddressFamily any #ListenAddress 0.0.0.0 -@@ -114,3 +118,7 @@ Subsystem sftp /usr/libexec/sftp-server - # AllowTcpForwarding no - # PermitTTY no - # ForceCommand cvs server -+ -+# 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 diff -up openssh/sshd_config_redhat.redhat openssh/sshd_config_redhat --- openssh/sshd_config_redhat.redhat 2020-02-13 18:14:02.268006439 +0100 +++ openssh/sshd_config_redhat 2020-02-13 18:19:20.765035947 +0100