dovecot-2.2: auth: Fixed also DOVECOT-TOKEN (=URLAUTH) and NTLM/...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/ac54838e9071
changeset: 16137:ac54838e9071
user:      Timo Sirainen <tss at iki.fi>
date:      Tue Apr 02 11:22:52 2013 +0300
description:
auth: Fixed also DOVECOT-TOKEN (=URLAUTH) and NTLM/GSS-SPNEGO (via winbind) to work.

diffstat:

 src/auth/mech-dovecot-token.c |  6 ++++--
 src/auth/mech-winbind.c       |  3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diffs (31 lines):

diff -r caead8e506dc -r ac54838e9071 src/auth/mech-dovecot-token.c
--- a/src/auth/mech-dovecot-token.c	Tue Apr 02 11:18:45 2013 +0300
+++ b/src/auth/mech-dovecot-token.c	Tue Apr 02 11:22:52 2013 +0300
@@ -51,10 +51,12 @@
 		const char *valid_token =
 			auth_token_get(service, pid, request->user, session_id);
 
-		if (strcmp(auth_token, valid_token) == 0)
+		if (strcmp(auth_token, valid_token) == 0) {
+			request->passdb_success = TRUE;
 			auth_request_success(request, NULL, 0);
-		else
+		} else {
 			auth_request_fail(request);
+		}
 	}
 
 	/* make sure it's cleared */
diff -r caead8e506dc -r ac54838e9071 src/auth/mech-winbind.c
--- a/src/auth/mech-winbind.c	Tue Apr 02 11:18:45 2013 +0300
+++ b/src/auth/mech-winbind.c	Tue Apr 02 11:22:52 2013 +0300
@@ -257,7 +257,8 @@
 					      "%s", error);
 			return HR_FAIL;
 		}
- 
+
+		request->auth_request.passdb_success = TRUE;
 		if (gss_spnego && strcmp(token[1], "*") != 0) {
 			buffer_t *buf;