Mercurial > dovecot > original-hg > dovecot-1.2
changeset 9642:e7721f67688a HEAD
imap/pop3-login: If AUTHENTICATE is aborted, don't do "auth failed" delay.
author | Timo Sirainen <tss@iki.fi> |
---|---|
date | Sat, 12 Mar 2011 16:05:57 +0200 |
parents | 91c605339e45 |
children | ede60b230594 |
files | src/imap-login/client-authenticate.c src/pop3-login/client-authenticate.c |
diffstat | 2 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/imap-login/client-authenticate.c Fri Mar 04 19:27:32 2011 +0200 +++ b/src/imap-login/client-authenticate.c Sat Mar 12 16:05:57 2011 +0200 @@ -294,9 +294,10 @@ break; } - if (reply == SASL_SERVER_REPLY_AUTH_ABORTED) + if (reply == SASL_SERVER_REPLY_AUTH_ABORTED) { msg = "BAD Authentication aborted by client."; - else if (data == NULL) + nodelay = TRUE; + } else if (data == NULL) msg = "NO "IMAP_AUTH_FAILED_MSG; else msg = t_strconcat("NO [ALERT] ", data, NULL);
--- a/src/pop3-login/client-authenticate.c Fri Mar 04 19:27:32 2011 +0200 +++ b/src/pop3-login/client-authenticate.c Sat Mar 12 16:05:57 2011 +0200 @@ -252,9 +252,10 @@ break; } - if (reply == SASL_SERVER_REPLY_AUTH_ABORTED) + if (reply == SASL_SERVER_REPLY_AUTH_ABORTED) { msg = "-ERR Authentication aborted by client."; - else if (data == NULL) + nodelay = TRUE; + } else if (data == NULL) msg = "-ERR "AUTH_FAILED_MSG; else msg = t_strconcat("-ERR ", data, NULL);