- (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 073c89078b5a2d69f70248e67ac5d12b15fca7b8..e1dec76982052797dd559d81b28573fc014d9f16 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20031007
+ - (dtucker) [contrib/redhat/openssh.spec] Bug #714: Now that UsePAM is a
+   run-time switch, always build --with-md5-passwords.
+
 20031003
  - (tim) [contrib/caldera/openssh.spec] Remove obsolete --with-ipv4-default
    option.

diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index 20ccb6fac128c4892ec1c67a504a840588cb32e0..9d826074bc6f3198d4ba804ffd3fed23a8aa7d79 100644 (file)
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -185,11 +185,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