jonathan/openssh
1
0
Fork 0
forked from rpms/openssh
Code Pull Requests Activity

Proper content of the included configuration files

Browse Source
This commit is contained in:
Jakub Jelen 2016-08-15 12:18:50 +02:00
parent 73953d29f1
commit 38d533a5e1
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openssh-6.6p1-redhat.patch
View File

@ -10,11 +10,11 @@ index 49a4f6c..3f83c40 100644
+# To modify the system-wide ssh configuration, create a file under +# To modify the system-wide ssh configuration, create a file under
+# /etc/ssh/ssh_config.d/ which will get automatically included below +# /etc/ssh/ssh_config.d/ which will get automatically included below
+Include /etc/ssh/ssh_config.d/*.conf +Include /etc/ssh/ssh_config.d/*.conf
diff --git a/ssh_config.redhat b/ssh_config.redhat diff --git a/ssh_config_redhat b/ssh_config_redhat
new file mode 100644 new file mode 100644
index 0000000..9082a13 index 0000000..9082a13
--- /dev/null --- /dev/null
+++ b/ssh_config.redhat +++ b/ssh_config_redhat
@@ -0,0 +1,17 @@ @@ -0,0 +1,17 @@
+# Uncomment this if you want to use .local domain +# Uncomment this if you want to use .local domain
+# Host *.local +# Host *.local

2
openssh.spec
View File

@ -638,7 +638,7 @@ install -d $RPM_BUILD_ROOT%{_libdir}/fipscheck
install -m644 %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/sshd install -m644 %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/sshd
install -m644 %{SOURCE6} $RPM_BUILD_ROOT/etc/pam.d/ssh-keycat install -m644 %{SOURCE6} $RPM_BUILD_ROOT/etc/pam.d/ssh-keycat
install -m644 %{SOURCE7} $RPM_BUILD_ROOT/etc/sysconfig/sshd install -m644 %{SOURCE7} $RPM_BUILD_ROOT/etc/sysconfig/sshd
install -m644 ssh_config.redhat $RPM_BUILD_ROOT/etc/ssh/ssh_config.d/05-redhat.conf install -m644 ssh_config_redhat $RPM_BUILD_ROOT/etc/ssh/ssh_config.d/05-redhat.conf
install -d -m755 $RPM_BUILD_ROOT/%{_unitdir} install -d -m755 $RPM_BUILD_ROOT/%{_unitdir}
install -m644 %{SOURCE9} $RPM_BUILD_ROOT/%{_unitdir}/sshd@.service install -m644 %{SOURCE9} $RPM_BUILD_ROOT/%{_unitdir}/sshd@.service
install -m644 %{SOURCE10} $RPM_BUILD_ROOT/%{_unitdir}/sshd.socket install -m644 %{SOURCE10} $RPM_BUILD_ROOT/%{_unitdir}/sshd.socket