diff options
author | Damien Miller <djm@mindrot.org> | 2001-02-27 10:53:00 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2001-02-27 10:53:00 +1100 |
commit | 9b40580d762f660230ebbe4fc7121a94cbebae58 (patch) | |
tree | 33b903b8536c1400abf87f80f648f27c97530d25 | |
parent | 7bd1c6262b059064ce71e39a883c8f0de8a25139 (diff) |
- (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.
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | contrib/caldera/openssh.spec | 3 | ||||
-rw-r--r-- | contrib/redhat/openssh.spec | 3 |
3 files changed, 8 insertions, 3 deletions
@@ -15,6 +15,9 @@ | |||
15 | - (djm) Warning fix on entropy.c saved uid stuff. Patch from Mark Miller | 15 | - (djm) Warning fix on entropy.c saved uid stuff. Patch from Mark Miller |
16 | <markm@swoon.net> | 16 | <markm@swoon.net> |
17 | - (djm) Fix PAM fix | 17 | - (djm) Fix PAM fix |
18 | - (djm) Remove 'noreplace' flag from sshd_config in RPM spec files. This | ||
19 | change is being made as 2.5.x configfiles are not back-compatible with | ||
20 | 2.3.x. | ||
18 | 21 | ||
19 | 20010226 | 22 | 20010226 |
20 | - (bal) Fixed bsd-snprinf.c so it now honors 'BROKEN_SNPRINTF' again. | 23 | - (bal) Fixed bsd-snprinf.c so it now honors 'BROKEN_SNPRINTF' again. |
@@ -4149,4 +4152,4 @@ | |||
4149 | - Wrote replacements for strlcpy and mkdtemp | 4152 | - Wrote replacements for strlcpy and mkdtemp |
4150 | - Released 1.0pre1 | 4153 | - Released 1.0pre1 |
4151 | 4154 | ||
4152 | $Id: ChangeLog,v 1.833 2001/02/26 23:48:01 djm Exp $ | 4155 | $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 | |||
276 | %attr(0755,root,root) %{_libexecdir}/openssh/sftp-server | 276 | %attr(0755,root,root) %{_libexecdir}/openssh/sftp-server |
277 | %attr(0644,root,root) %{_mandir}/man8/sshd.8* | 277 | %attr(0644,root,root) %{_mandir}/man8/sshd.8* |
278 | %attr(0644,root,root) %{_mandir}/man8/sftp-server.8* | 278 | %attr(0644,root,root) %{_mandir}/man8/sftp-server.8* |
279 | %attr(0600,root,root) %config(noreplace) %{_sysconfdir}/sshd_config | 279 | #%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/sshd_config |
280 | %attr(0600,root,root) %config %{_sysconfdir}/sshd_config | ||
280 | %attr(0600,root,root) %config(noreplace) /etc/pam.d/sshd | 281 | %attr(0600,root,root) %config(noreplace) /etc/pam.d/sshd |
281 | %attr(0755,root,root) %config /etc/rc.d/init.d/sshd | 282 | %attr(0755,root,root) %config /etc/rc.d/init.d/sshd |
282 | %attr(0755,root,root) %config /etc/sysconfig/daemons/sshd | 283 | %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 | |||
263 | %attr(0755,root,root) %{_libexecdir}/openssh/sftp-server | 263 | %attr(0755,root,root) %{_libexecdir}/openssh/sftp-server |
264 | %attr(0644,root,root) %{_mandir}/man8/sshd.8* | 264 | %attr(0644,root,root) %{_mandir}/man8/sshd.8* |
265 | %attr(0644,root,root) %{_mandir}/man8/sftp-server.8* | 265 | %attr(0644,root,root) %{_mandir}/man8/sftp-server.8* |
266 | %attr(0600,root,root) %config(noreplace) %{_sysconfdir}/sshd_config | 266 | #%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/sshd_config |
267 | %attr(0600,root,root) %config %{_sysconfdir}/sshd_config | ||
267 | %attr(0600,root,root) %config(noreplace) /etc/pam.d/sshd | 268 | %attr(0600,root,root) %config(noreplace) /etc/pam.d/sshd |
268 | %attr(0755,root,root) %config /etc/rc.d/init.d/sshd | 269 | %attr(0755,root,root) %config /etc/rc.d/init.d/sshd |
269 | 270 | ||