- (djm) Rename sysconfdir/primes => sysconfdir/moduli

diff --git a/ChangeLog b/ChangeLog
index 8b357a6010a4eb3f2941f9efd9076d80531bdb96..e2e840c08dd64a89750ddc8d9d19f6ffca2024f7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
  - (djm) Remove redundant and incorrect test for max auth attempts in 
    PAM kbdint code. Based on fix from Matthew Melvin 
   <matthewm@webcentral.com.au>
+ - (djm) Rename sysconfdir/primes => sysconfdir/moduli
 
 20010625
  - OpenBSD CVS Sync

diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index 09c42a09325bee7c6ed84fee4bfcd7e32bdaa486..dd9a3e2531e4171931e4ee52eb33f9b0eb8a6553 100644 (file)
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -251,7 +251,7 @@ fi
 %attr(0644,root,root) %{_mandir}/man1/ssh-keyscan.1*
 %attr(0644,root,root) %{_mandir}/man1/scp.1*
 %attr(0755,root,root) %dir %{_sysconfdir}
-%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/primes
+%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/moduli
 %attr(0755,root,root) %dir %{_libexecdir}/openssh
 
 %files clients

diff --git a/contrib/suse/openssh.spec b/contrib/suse/openssh.spec
index 4075d4f827ca0def7aa72b4104402d6d1a9a764b..1327ca85454488adb4b8a21e33a2f8b7ff0e7123 100644 (file)
--- a/contrib/suse/openssh.spec
+++ b/contrib/suse/openssh.spec
@@ -171,7 +171,7 @@ fi
 %attr(0755,root,root) %dir /etc/ssh
 %attr(0644,root,root) %config /etc/ssh/ssh_config
 %attr(0600,root,root) %config /etc/ssh/sshd_config
-%attr(0600,root,root) %config /etc/ssh/primes
+%attr(0600,root,root) %config /etc/ssh/moduli
 %attr(0644,root,root) %config /etc/pam.d/sshd
 %attr(0755,root,root) %config /sbin/init.d/sshd
 %attr(0755,root,root) /usr/bin/ssh-keygen

diff --git a/primes b/moduli
similarity index 100%
rename from primes
rename to moduli