From 9b40580d762f660230ebbe4fc7121a94cbebae58 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Tue, 27 Feb 2001 10:53:00 +1100 Subject: - (djm) Remove 'noreplace' flag from sshd_config in RPM spec files. This change is being made as 2.5.x configfiles are not back-compatible with 2.3.x. --- ChangeLog | 5 ++++- contrib/caldera/openssh.spec | 3 ++- contrib/redhat/openssh.spec | 3 ++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5a278e972..c1111eb48 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,9 @@ - (djm) Warning fix on entropy.c saved uid stuff. Patch from Mark Miller - (djm) Fix PAM fix + - (djm) Remove 'noreplace' flag from sshd_config in RPM spec files. This + change is being made as 2.5.x configfiles are not back-compatible with + 2.3.x. 20010226 - (bal) Fixed bsd-snprinf.c so it now honors 'BROKEN_SNPRINTF' again. @@ -4149,4 +4152,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.833 2001/02/26 23:48:01 djm Exp $ +$Id: ChangeLog,v 1.834 2001/02/26 23:53:00 djm Exp $ diff --git a/contrib/caldera/openssh.spec b/contrib/caldera/openssh.spec index fed3d426c..ee665bef0 100644 --- a/contrib/caldera/openssh.spec +++ b/contrib/caldera/openssh.spec @@ -276,7 +276,8 @@ fi %attr(0755,root,root) %{_libexecdir}/openssh/sftp-server %attr(0644,root,root) %{_mandir}/man8/sshd.8* %attr(0644,root,root) %{_mandir}/man8/sftp-server.8* -%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/sshd_config +#%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/sshd_config +%attr(0600,root,root) %config %{_sysconfdir}/sshd_config %attr(0600,root,root) %config(noreplace) /etc/pam.d/sshd %attr(0755,root,root) %config /etc/rc.d/init.d/sshd %attr(0755,root,root) %config /etc/sysconfig/daemons/sshd diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec index fb2803bf5..806a05e38 100644 --- a/contrib/redhat/openssh.spec +++ b/contrib/redhat/openssh.spec @@ -263,7 +263,8 @@ fi %attr(0755,root,root) %{_libexecdir}/openssh/sftp-server %attr(0644,root,root) %{_mandir}/man8/sshd.8* %attr(0644,root,root) %{_mandir}/man8/sftp-server.8* -%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/sshd_config +#%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/sshd_config +%attr(0600,root,root) %config %{_sysconfdir}/sshd_config %attr(0600,root,root) %config(noreplace) /etc/pam.d/sshd %attr(0755,root,root) %config /etc/rc.d/init.d/sshd -- cgit v1.2.3