From: Timo Sirainen <tss@iki.fi>
Date: Fri, 19 Mar 2010 15:51:28 +0000 (+0200)
Subject: auth: Do username checks/translations even when ssl_username_from_cert=yes
X-Git-Tag: 2.0.beta4~14
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=00b38db02edcb55cd00e769b2b00a3e43efe867b;p=thirdparty%2Fdovecot%2Fcore.git

auth: Do username checks/translations even when ssl_username_from_cert=yes

--HG--
branch : HEAD
---

diff --git a/src/auth/auth-request.c b/src/auth/auth-request.c
index 7e7a60858f..9208e7a922 100644
--- a/src/auth/auth-request.c
+++ b/src/auth/auth-request.c
@@ -868,8 +868,9 @@ bool auth_request_set_username(struct auth_request *request,
 	}
 	if (request->cert_username) {
 		/* cert_username overrides the username given by
-		   authentication mechanism. */
-		return TRUE;
+		   authentication mechanism. but still do checks and
+		   translations to it. */
+		username = request->user;
 	}
 
 	if (*username == '\0') {