# HG changeset patch
# User Timo Sirainen <tss@iki.fi>
# Date 1199581862 -7200
# Node ID 05bc8679c886d01f855e2418dbfaf9d2f21f9b42
# Parent  eb71cda96663a71c5d4c5815b396c04565a8b4b4
Fixed assert-crash when login fails to proxied server.

diff -r eb71cda96663 -r 05bc8679c886 src/imap-login/client-authenticate.c
--- a/src/imap-login/client-authenticate.c	Sun Jan 06 02:19:29 2008 +0200
+++ b/src/imap-login/client-authenticate.c	Sun Jan 06 03:11:02 2008 +0200
@@ -19,8 +19,6 @@
 
 #define IMAP_SERVICE_NAME "imap"
 
-static void client_auth_failed(struct imap_client *client);
-
 const char *client_authenticate_get_capabilities(bool secured)
 {
 	const struct auth_mech_desc *mech;
@@ -84,8 +82,6 @@
 		io_remove(&client->io);
 	client->io = io_add(client->common.fd, IO_READ,
 			    client_input, client);
-
-	timeout_remove(&client->to_auth_waiting);
 }
 
 static bool client_handle_args(struct imap_client *client,
@@ -205,6 +201,7 @@
 
 	switch (reply) {
 	case SASL_SERVER_REPLY_SUCCESS:
+		timeout_remove(&client->to_auth_waiting);
 		if (args != NULL) {
 			if (client_handle_args(client, args, TRUE))
 				break;
@@ -215,6 +212,7 @@
 		break;
 	case SASL_SERVER_REPLY_AUTH_FAILED:
 	case SASL_SERVER_REPLY_CLIENT_ERROR:
+		timeout_remove(&client->to_auth_waiting);
 		if (args != NULL) {
 			if (client_handle_args(client, args, FALSE))
 				break;