From: Timo Sirainen <tss@iki.fi>
Date: Tue, 26 May 2009 03:33:56 +0000 (-0400)
Subject: imap: Don't send "Waiting for auth process" if it's the client that's waiting on... 
X-Git-Tag: 2.0.alpha1~679
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9964d0c6260406ec00ec1fa2f03c506eec1b74f4;p=thirdparty%2Fdovecot%2Fcore.git

imap: Don't send "Waiting for auth process" if it's the client that's waiting on AUTHENTICATE.

--HG--
branch : HEAD
---

diff --git a/src/imap-login/client-authenticate.c b/src/imap-login/client-authenticate.c
index 5d7d44797d..63f32e7204 100644
--- a/src/imap-login/client-authenticate.c
+++ b/src/imap-login/client-authenticate.c
@@ -71,6 +71,7 @@ static void client_auth_input(struct imap_client *client)
 		sasl_server_auth_client_error(&client->common,
 					      "Authentication aborted");
 	} else {
+		client_set_auth_waiting(client);
 		auth_client_request_continue(client->common.auth_request, line);
 		io_remove(&client->io);
 
@@ -308,6 +309,9 @@ static void sasl_callback(struct client *_client, enum sasl_server_reply reply,
 		   to call client_destroy() in here. */
 		(void)o_stream_sendv(client->output, iov, 3);
 
+		if (client->to_auth_waiting != NULL)
+			timeout_remove(&client->to_auth_waiting);
+
 		i_assert(client->io == NULL);
 		client->io = io_add(client->common.fd, IO_READ,
 				    client_auth_input, client);