From: Timo Sirainen <tss@iki.fi>
Date: Wed, 9 Jul 2008 12:22:36 +0000 (+0530)
Subject: ldap: MD5 -> PLAIN-MD5 autoconversion is no longer necessary since it's done
X-Git-Tag: 1.2.alpha1~176
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fbb47bf2da417135cad45136ef855d5985ad6678;p=thirdparty%2Fdovecot%2Fcore.git

ldap: MD5 -> PLAIN-MD5 autoconversion is no longer necessary since it's done
in the generic MD5 verification code now.

--HG--
branch : HEAD
---

diff --git a/src/auth/passdb-ldap.c b/src/auth/passdb-ldap.c
index 678842611c..17b3a452d6 100644
--- a/src/auth/passdb-ldap.c
+++ b/src/auth/passdb-ldap.c
@@ -131,16 +131,6 @@ ldap_lookup_pass_callback(struct ldap_connection *conn,
 	/* auth_request_set_field() sets scheme */
 	i_assert(password == NULL || scheme != NULL);
 
-	/* LDAP's RFC2307 specifies the MD5 scheme for what we call PLAIN-MD5.
-	   We can detect this case, because base64 doesn't use '$'. */
-	if (scheme != NULL && strncasecmp(scheme, "MD5", 3) == 0 &&
-	    strncmp(password, "$1$", 3) != 0) {
-		auth_request_log_debug(auth_request, "ldap",
-				       "Password doesn't look like MD5-CRYPT, "
-				       "scheme changed to PLAIN-MD5");
-		scheme = "PLAIN-MD5";
-	}
-
 	if (auth_request->credentials_scheme != NULL) {
 		passdb_handle_credentials(passdb_result, password, scheme,
 			ldap_request->callback.lookup_credentials,