From 12eceb2efc8b8310e041a89339c671c86cfce386 Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Wed, 31 Oct 2001 10:31:13 +1100
Subject:  - (djm) Unsmoke drugs: config files should be noreplace.

---
 ChangeLog                   |  5 ++++-
 contrib/redhat/openssh.spec | 10 +++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 18b72efb..4e010df9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+20011031
+ - (djm) Unsmoke drugs: config files should be noreplace.
+
 20011030
  - (djm) Redhat RPM spec: remove noreplace from config files, allow IPv6 
    by default (can force IPv4 using --define "noipv6 1")
@@ -6789,4 +6792,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1628 2001/10/30 11:03:51 djm Exp $
+$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 bdc5fba0..e957bae6 100644
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -245,7 +245,7 @@ fi
 %attr(0644,root,root) %{_mandir}/man1/ssh-keygen.1*
 %attr(0644,root,root) %{_mandir}/man1/scp.1*
 %attr(0755,root,root) %dir %{_sysconfdir}
-%attr(0600,root,root) %config %{_sysconfdir}/moduli
+%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/moduli
 %attr(0755,root,root) %dir %{_libexecdir}/openssh
 %if %{scard}
 %attr(0755,root,root) %dir %{_datadir}/openssh
@@ -264,7 +264,7 @@ fi
 %attr(0644,root,root) %{_mandir}/man1/ssh-add.1*
 %attr(0644,root,root) %{_mandir}/man1/ssh-keyscan.1*
 %attr(0644,root,root) %{_mandir}/man1/sftp.1*
-%attr(0644,root,root) %config %{_sysconfdir}/ssh_config
+%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/ssh_config
 %attr(-,root,root) %{_bindir}/slogin
 %attr(-,root,root) %{_mandir}/man1/slogin.1*
 
@@ -274,9 +274,9 @@ 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 %{_sysconfdir}/sshd_config
-%attr(0600,root,root) %config %{_sysconfdir}/sshd_config
-%attr(0600,root,root) %config /etc/pam.d/sshd
+#%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/sshd_config
+%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/sshd_config
+%attr(0600,root,root) %config(noreplace) /etc/pam.d/sshd
 %attr(0755,root,root) %config /etc/rc.d/init.d/sshd
 
 %if ! %{no_x11_askpass}
-- 
cgit v1.2.3