From dfe6d914b7d2ad845a7fe2e92bdc4ff7c6f44539 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Tue, 7 Oct 2003 17:40:56 +1000
Subject: [PATCH]  - (dtucker) [contrib/redhat/openssh.spec] Bug #714: Now that
 UsePAM is a    run-time switch, always build --with-md5-passwords.

---
 ChangeLog                   | 4 +++-
 contrib/redhat/openssh.spec | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1f3db2b85..bcca919b4 100644
--- 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
@@ -1284,4 +1286,4 @@
  - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
    Report from murple@murple.net, diagnosis from dtucker@zip.com.au
 
-$Id: ChangeLog,v 1.3059 2003/10/07 01:31:22 dtucker Exp $
+$Id: ChangeLog,v 1.3060 2003/10/07 07:40:56 dtucker Exp $
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index 09e405475..dd00c9fa9 100644
--- 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