From c88ac35c17e1f0a48bde13ec0a1e4797cc885f96 Mon Sep 17 00:00:00 2001
From: hns <hannesw@gmail.com>
Date: Tue, 26 Mar 2002 12:09:32 +0000
Subject: [PATCH] Try both Unix crypt and Stefan's new MD5 encoding for
 authentication.

---
 src/helma/util/CryptFile.java | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/helma/util/CryptFile.java b/src/helma/util/CryptFile.java
index dd9b16ab..e33228c0 100644
--- a/src/helma/util/CryptFile.java
+++ b/src/helma/util/CryptFile.java
@@ -31,9 +31,18 @@ public class CryptFile {
 	    users.clear ();
 	String realpw = users.getProperty (username);
 	if (realpw != null) {
-	    // check if password matches
-	    String cryptpw = Crypt.crypt (realpw, pw);
-	    return realpw.equals (cryptpw);
+	    try {
+	        // check if password matches
+	        // first we try with unix crypt algorithm
+	        String cryptpw = Crypt.crypt (realpw, pw);
+	        if (realpw.equals (cryptpw))
+	            return true;
+	        // then try MD5
+	        if (realpw.equals (MD5Encoder.encode (pw)))
+	            return true;
+	    } catch (Exception x) {
+	        return false;
+	    }
 	} else {
 	    if (parentFile != null)
 	        return parentFile.authenticate (username, pw);