[dovecot-cvs] dovecot/src/imap-login client-authenticate.c, 1.39.2.4, 1.39.2.5 client.c, 1.51.2.8, 1.51.2.9
tss at dovecot.org
tss at dovecot.org
Sun Nov 12 12:41:31 UTC 2006
Update of /var/lib/cvs/dovecot/src/imap-login
In directory talvi:/tmp/cvs-serv14609/imap-login
Modified Files:
Tag: branch_1_0
client-authenticate.c client.c
Log Message:
Fixed potential problems with client disconnecting while master was handling
the login.
Index: client-authenticate.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/imap-login/client-authenticate.c,v
retrieving revision 1.39.2.4
retrieving revision 1.39.2.5
diff -u -d -r1.39.2.4 -r1.39.2.5
--- client-authenticate.c 7 Nov 2006 15:06:17 -0000 1.39.2.4
+++ client-authenticate.c 12 Nov 2006 12:41:28 -0000 1.39.2.5
@@ -182,7 +182,9 @@
const char *msg;
size_t data_len;
- i_assert(!client->destroyed || reply == SASL_SERVER_REPLY_CLIENT_ERROR);
+ i_assert(!client->destroyed ||
+ reply == SASL_SERVER_REPLY_CLIENT_ERROR ||
+ reply == SASL_SERVER_REPLY_MASTER_FAILED);
switch (reply) {
case SASL_SERVER_REPLY_SUCCESS:
Index: client.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/imap-login/client.c,v
retrieving revision 1.51.2.8
retrieving revision 1.51.2.9
diff -u -d -r1.51.2.8 -r1.51.2.9
--- client.c 7 Nov 2006 15:19:30 -0000 1.51.2.8
+++ client.c 12 Nov 2006 12:41:28 -0000 1.51.2.9
@@ -468,6 +468,9 @@
if (client->output != NULL)
o_stream_close(client->output);
+ if (client->common.master_tag != 0)
+ master_request_abort(&client->common);
+
if (client->common.auth_request != NULL) {
i_assert(client->common.authenticating);
sasl_server_auth_client_error(&client->common, NULL);
@@ -475,9 +478,6 @@
i_assert(!client->common.authenticating);
}
- if (client->common.master_tag != 0)
- master_request_abort(&client->common);
-
if (client->io != NULL)
io_remove(&client->io);
More information about the dovecot-cvs
mailing list