[dovecot-cvs] dovecot/src/imap cmd-idle.c, 1.13, 1.14 client.c, 1.40, 1.41

[cras at dovecot.org]

Update of /home/cvs/dovecot/src/imap
In directory talvi:/tmp/cvs-serv2258

Modified Files:
	cmd-idle.c client.c 
Log Message:
Set bad_counter before calling client_command_reset because it may parse
more commands.



Index: cmd-idle.c
===================================================================
RCS file: /home/cvs/dovecot/src/imap/cmd-idle.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- cmd-idle.c	18 Aug 2004 23:53:39 -0000	1.13
+++ cmd-idle.c	22 Aug 2004 09:15:26 -0000	1.14
@@ -54,8 +54,8 @@
 
 	o_stream_uncork(client->output);
 
-	_client_reset_command(client);
 	client->bad_counter = 0;
+	_client_reset_command(client);
 }
 
 static void idle_client_input(void *context)

Index: client.c
===================================================================
RCS file: /home/cvs/dovecot/src/imap/client.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- client.c	18 Aug 2004 23:53:39 -0000	1.40
+++ client.c	22 Aug 2004 09:15:26 -0000	1.41
@@ -265,8 +265,8 @@
 		/* command is being executed - continue it */
 		if (client->cmd_func(client)) {
 			/* command execution was finished */
-			_client_reset_command(client);
                         client->bad_counter = 0;
+			_client_reset_command(client);
 			return TRUE;
 		}
 		return FALSE;
@@ -313,8 +313,8 @@
 		client->input_skip_line = TRUE;
 		if (client->cmd_func(client)) {
 			/* command execution was finished */
-			_client_reset_command(client);
                         client->bad_counter = 0;
+			_client_reset_command(client);
 		} else {
 			/* unfinished */
 			return FALSE;
@@ -381,8 +381,8 @@
 		o_stream_cork(client->output);
 		if (client->cmd_func(client)) {
 			/* command execution was finished */
-			_client_reset_command(client);
                         client->bad_counter = 0;
+			_client_reset_command(client);
 		}
 		o_stream_uncork(client->output);
 	}