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

--HG--
branch : HEAD

diff --git a/src/imap-login/client-authenticate.c b/src/imap-login/client-authenticate.c
index 5d7d44797dad8091ccfaa9d4bcc76ce7f3c2cbfa..63f32e7204be9edaab93810906a5ae92b04a59ab 100644 (file)
--- 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);