From: Timo Sirainen <tss@iki.fi>
Date: Mon, 23 May 2011 12:37:43 +0000 (+0300)
Subject: auth: Give password scheme suggestions also when passdb data is invalid for scheme.
X-Git-Tag: 2.1.alpha1~253
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=31e557dc28cb913ebc07488e2d8e170937bdeddb;p=thirdparty%2Fdovecot%2Fcore.git

auth: Give password scheme suggestions also when passdb data is invalid for scheme.
---

diff --git a/src/auth/auth-request.c b/src/auth/auth-request.c
index b7572e2255..1cb5c00ae8 100644
--- a/src/auth/auth-request.c
+++ b/src/auth/auth-request.c
@@ -1468,6 +1468,7 @@ int auth_request_password_verify(struct auth_request *request,
 {
 	const unsigned char *raw_password;
 	size_t raw_password_size;
+	const char *error;
 	int ret;
 
 	if (request->skip_password_check) {
@@ -1505,17 +1506,22 @@ int auth_request_password_verify(struct auth_request *request,
 	   password schemes (eg. digest-md5). Otherwise the username is used
 	   only for logging purposes. */
 	ret = password_verify(plain_password, request->original_username,
-			      scheme, raw_password, raw_password_size);
-	i_assert(ret >= 0);
-	if (ret == 0) {
+			      scheme, raw_password, raw_password_size, &error);
+	if (ret < 0) {
+		const char *password_str = request->set->debug_passwords ?
+			t_strdup_printf(" '%s'", crypted_password) : "";
+		auth_request_log_error(request, subsystem,
+				       "Invalid password%s in passdb: %s",
+				       password_str, error);
+	} else if (ret == 0) {
 		auth_request_log_password_mismatch(request, subsystem);
-		if (request->set->debug_passwords) T_BEGIN {
-			log_password_failure(request, plain_password,
-					     crypted_password, scheme,
-					     request->original_username,
-					     subsystem);
-		} T_END;
 	}
+	if (ret <= 0 && request->set->debug_passwords) T_BEGIN {
+		log_password_failure(request, plain_password,
+				     crypted_password, scheme,
+				     request->original_username,
+				     subsystem);
+	} T_END;
 	return ret;
 }