dovecot-1.2: imap/pop3-login: If AUTHENTICATE is aborted, don't ...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-1.2/rev/e7721f67688a
changeset: 9642:e7721f67688a
user:      Timo Sirainen <tss at iki.fi>
date:      Sat Mar 12 16:05:57 2011 +0200
description:
imap/pop3-login: If AUTHENTICATE is aborted, don't do "auth failed" delay.

diffstat:

 src/imap-login/client-authenticate.c |  5 +++--
 src/pop3-login/client-authenticate.c |  5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diffs (32 lines):

diff -r 91c605339e45 -r e7721f67688a src/imap-login/client-authenticate.c
--- 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);
diff -r 91c605339e45 -r e7721f67688a src/pop3-login/client-authenticate.c
--- 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);