dovecot-2.0: imap: Don't send "Waiting for auth process" if it's...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.0/rev/ca2488181a2d
changeset: 9373:ca2488181a2d
user:      Timo Sirainen <tss at iki.fi>
date:      Mon May 25 23:33:56 2009 -0400
description:
imap: Don't send "Waiting for auth process" if it's the client that's waiting on AUTHENTICATE.

diffstat:

1 file changed, 4 insertions(+)
src/imap-login/client-authenticate.c |    4 ++++

diffs (21 lines):

diff -r b1c584654a0e -r ca2488181a2d src/imap-login/client-authenticate.c
--- a/src/imap-login/client-authenticate.c	Mon May 25 22:38:26 2009 -0400
+++ b/src/imap-login/client-authenticate.c	Mon May 25 23:33:56 2009 -0400
@@ -71,6 +71,7 @@ static void client_auth_input(struct ima
 		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 
 		   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);