dovecot-2.2: imap-urlauth-worker: Fixed a crash (by removing unn...

dovecot at dovecot.org dovecot at dovecot.org
Thu May 2 18:30:00 EEST 2013


details:   http://hg.dovecot.org/dovecot-2.2/rev/2a3134b0c25d
changeset: 16324:2a3134b0c25d
user:      Timo Sirainen <tss at iki.fi>
date:      Thu May 02 18:29:50 2013 +0300
description:
imap-urlauth-worker: Fixed a crash (by removing unnecessary code)

diffstat:

 src/imap-urlauth/imap-urlauth-worker.c |  7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diffs (38 lines):

diff -r 5e2fa592c268 -r 2a3134b0c25d src/imap-urlauth/imap-urlauth-worker.c
--- a/src/imap-urlauth/imap-urlauth-worker.c	Thu May 02 18:18:26 2013 +0300
+++ b/src/imap-urlauth/imap-urlauth-worker.c	Thu May 02 18:29:50 2013 +0300
@@ -54,7 +54,7 @@
 	struct io *io, *ctrl_io;
 	struct istream *input, *ctrl_input;
 	struct ostream *output, *ctrl_output;
-	struct timeout *to_idle, *to_delay;
+	struct timeout *to_idle;
 
 	char *access_user;
 	ARRAY_TYPE(string) access_apps;
@@ -245,8 +245,6 @@
 		io_remove(&client->ctrl_io);
 	if (client->to_idle != NULL)
 		timeout_remove(&client->to_idle);
-	if (client->to_delay != NULL)
-		timeout_remove(&client->to_delay);
 
 	if (client->input != NULL)
 		i_stream_destroy(&client->input);
@@ -605,7 +603,6 @@
 			i_debug("User %s doesn't exist", input.username);
 
 		client_send_line(client, "NO");
-		timeout_remove(&client->to_delay);
 		return 1;
 	}
 
@@ -669,7 +666,7 @@
 	const char *line, *cmd, *error;
 	int ret;
 
-	if (client->url != NULL || client->to_delay != NULL) {
+	if (client->url != NULL) {
 		/* we're still processing a URL. wait until it's
 		   finished. */
 		io_remove(&client->io);


More information about the dovecot-cvs mailing list