- (dtucker) [contrib/redhat/openssh.spec] Bug #714: Now that UsePAM is a

   run-time switch, always build --with-md5-passwords.

diff --git a/ChangeLog b/ChangeLog
index 656c2ea2b126c3adf0999ca82f7c3aa3c3a4d339..90ae9f748f93f9df6cfe4e4731367ae148bcd731 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
  - (djm) Delete autom4te.cache after autoreconf
  - (dtucker) [auth-pam.c auth-pam.h session.c] Make PAM use the new static
    cleanup functions.  With & ok djm@
+ - (dtucker) [contrib/redhat/openssh.spec] Bug #714: Now that UsePAM is a
+   run-time switch, always build --with-md5-passwords.
 
 20031003
  - (dtucker) OpenBSD CVS Sync

diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index 09e4054758ecc0168516c6efb151a09cb82f4ac3..dd00c9fa978753ea1b18a55cc5d829b3ebbfb6f5 100644 (file)
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -190,11 +190,12 @@ CFLAGS="$RPM_OPT_FLAGS -Os"; export CFLAGS
        --with-default-path=/usr/local/bin:/bin:/usr/bin \
        --with-superuser-path=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin \
        --with-privsep-path=%{_var}/empty/sshd \
+       --with-md5-passwords \
 %if %{scard}
        --with-smartcard \
 %endif
 %if %{rescue}
-       --without-pam --with-md5-passwords \
+       --without-pam \
 %else
        --with-pam \
 %endif