diff options
author | Damien Miller <djm@mindrot.org> | 2001-10-31 10:31:13 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2001-10-31 10:31:13 +1100 |
commit | 12eceb2efc8b8310e041a89339c671c86cfce386 (patch) | |
tree | fc6fba53cea32f084ce1770bdbecbfc43ea7280b | |
parent | 1c613247288c06235b51d0f24f93eb99342f8c6a (diff) |
- (djm) Unsmoke drugs: config files should be noreplace.
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | contrib/redhat/openssh.spec | 10 |
2 files changed, 9 insertions, 6 deletions
@@ -1,3 +1,6 @@ | |||
1 | 20011031 | ||
2 | - (djm) Unsmoke drugs: config files should be noreplace. | ||
3 | |||
1 | 20011030 | 4 | 20011030 |
2 | - (djm) Redhat RPM spec: remove noreplace from config files, allow IPv6 | 5 | - (djm) Redhat RPM spec: remove noreplace from config files, allow IPv6 |
3 | by default (can force IPv4 using --define "noipv6 1") | 6 | by default (can force IPv4 using --define "noipv6 1") |
@@ -6789,4 +6792,4 @@ | |||
6789 | - Wrote replacements for strlcpy and mkdtemp | 6792 | - Wrote replacements for strlcpy and mkdtemp |
6790 | - Released 1.0pre1 | 6793 | - Released 1.0pre1 |
6791 | 6794 | ||
6792 | $Id: ChangeLog,v 1.1628 2001/10/30 11:03:51 djm Exp $ | 6795 | $Id: ChangeLog,v 1.1629 2001/10/30 23:31:13 djm Exp $ |
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec index bdc5fba07..e957bae66 100644 --- a/contrib/redhat/openssh.spec +++ b/contrib/redhat/openssh.spec | |||
@@ -245,7 +245,7 @@ fi | |||
245 | %attr(0644,root,root) %{_mandir}/man1/ssh-keygen.1* | 245 | %attr(0644,root,root) %{_mandir}/man1/ssh-keygen.1* |
246 | %attr(0644,root,root) %{_mandir}/man1/scp.1* | 246 | %attr(0644,root,root) %{_mandir}/man1/scp.1* |
247 | %attr(0755,root,root) %dir %{_sysconfdir} | 247 | %attr(0755,root,root) %dir %{_sysconfdir} |
248 | %attr(0600,root,root) %config %{_sysconfdir}/moduli | 248 | %attr(0600,root,root) %config(noreplace) %{_sysconfdir}/moduli |
249 | %attr(0755,root,root) %dir %{_libexecdir}/openssh | 249 | %attr(0755,root,root) %dir %{_libexecdir}/openssh |
250 | %if %{scard} | 250 | %if %{scard} |
251 | %attr(0755,root,root) %dir %{_datadir}/openssh | 251 | %attr(0755,root,root) %dir %{_datadir}/openssh |
@@ -264,7 +264,7 @@ fi | |||
264 | %attr(0644,root,root) %{_mandir}/man1/ssh-add.1* | 264 | %attr(0644,root,root) %{_mandir}/man1/ssh-add.1* |
265 | %attr(0644,root,root) %{_mandir}/man1/ssh-keyscan.1* | 265 | %attr(0644,root,root) %{_mandir}/man1/ssh-keyscan.1* |
266 | %attr(0644,root,root) %{_mandir}/man1/sftp.1* | 266 | %attr(0644,root,root) %{_mandir}/man1/sftp.1* |
267 | %attr(0644,root,root) %config %{_sysconfdir}/ssh_config | 267 | %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/ssh_config |
268 | %attr(-,root,root) %{_bindir}/slogin | 268 | %attr(-,root,root) %{_bindir}/slogin |
269 | %attr(-,root,root) %{_mandir}/man1/slogin.1* | 269 | %attr(-,root,root) %{_mandir}/man1/slogin.1* |
270 | 270 | ||
@@ -274,9 +274,9 @@ fi | |||
274 | %attr(0755,root,root) %{_libexecdir}/openssh/sftp-server | 274 | %attr(0755,root,root) %{_libexecdir}/openssh/sftp-server |
275 | %attr(0644,root,root) %{_mandir}/man8/sshd.8* | 275 | %attr(0644,root,root) %{_mandir}/man8/sshd.8* |
276 | %attr(0644,root,root) %{_mandir}/man8/sftp-server.8* | 276 | %attr(0644,root,root) %{_mandir}/man8/sftp-server.8* |
277 | #%attr(0600,root,root) %config %{_sysconfdir}/sshd_config | 277 | #%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/sshd_config |
278 | %attr(0600,root,root) %config %{_sysconfdir}/sshd_config | 278 | %attr(0600,root,root) %config(noreplace) %{_sysconfdir}/sshd_config |
279 | %attr(0600,root,root) %config /etc/pam.d/sshd | 279 | %attr(0600,root,root) %config(noreplace) /etc/pam.d/sshd |
280 | %attr(0755,root,root) %config /etc/rc.d/init.d/sshd | 280 | %attr(0755,root,root) %config /etc/rc.d/init.d/sshd |
281 | 281 | ||
282 | %if ! %{no_x11_askpass} | 282 | %if ! %{no_x11_askpass} |