# HG changeset patch
# User Timo Sirainen <tss@iki.fi>
# Date 1215606156 -19800
# Node ID a6d187abaa5a44e41abd599b3866c44d11f0d1a8
# Parent  399b81cc61896abfc30b3bcc4544b6c4924ee700
ldap: MD5 -> PLAIN-MD5 autoconversion is no longer necessary since it's done
in the generic MD5 verification code now.

diff -r 399b81cc6189 -r a6d187abaa5a src/auth/passdb-ldap.c
--- a/src/auth/passdb-ldap.c	Wed Jul 09 17:50:29 2008 +0530
+++ b/src/auth/passdb-ldap.c	Wed Jul 09 17:52:36 2008 +0530
@@ -131,16 +131,6 @@
 	/* 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,