From: Timo Sirainen <tss@iki.fi>
Date: Tue, 2 Nov 2010 18:06:39 +0000 (+0000)
Subject: sql auth: Fixed using password_noscheme
X-Git-Tag: 2.0.7~36
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dc8ba4890b74bde400e0feef96114940129ab181;p=thirdparty%2Fdovecot%2Fcore.git

sql auth: Fixed using password_noscheme
---

diff --git a/src/auth/passdb-sql.c b/src/auth/passdb-sql.c
index 6f7ef00325..7c2f217551 100644
--- a/src/auth/passdb-sql.c
+++ b/src/auth/passdb-sql.c
@@ -88,7 +88,8 @@ static void sql_query_callback(struct sql_result *result,
 		   found. Just checking if password is set isn't enough,
 		   because with proxies we might want to return NULL as
 		   password. */
-		if (sql_result_find_field(result, "password") < 0) {
+		if (sql_result_find_field(result, "password") < 0 &&
+		    sql_result_find_field(result, "password_noscheme") < 0) {
 			auth_request_log_error(auth_request, "sql",
 				"Password query must return a field named "
 				"'password'");