From: Aki Tuomi <aki.tuomi@dovecot.fi>
Date: Wed, 5 Apr 2017 11:23:26 +0000 (+0300)
Subject: imapc: Use IMAPC_COMMAND_STATE_AUTH_FAILED to indicate auth failure
X-Git-Tag: 2.2.30.rc1~169
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=553fcd5942e9365ce179a9e6b14e05e38df74a04;p=thirdparty%2Fdovecot%2Fcore.git

imapc: Use IMAPC_COMMAND_STATE_AUTH_FAILED to indicate auth failure
---

diff --git a/src/auth/passdb-imap.c b/src/auth/passdb-imap.c
index 399968ea93..4fdd174ee0 100644
--- a/src/auth/passdb-imap.c
+++ b/src/auth/passdb-imap.c
@@ -55,6 +55,7 @@ passdb_imap_login_callback(const struct imapc_command_reply *reply,
 		auth_request_log_info(request->auth_request, AUTH_SUBSYS_DB,
 				      "%s", reply->text_full);
 		break;
+	case IMAPC_COMMAND_STATE_AUTH_FAILED:
 	case IMAPC_COMMAND_STATE_BAD:
 	case IMAPC_COMMAND_STATE_DISCONNECTED:
 		auth_request_log_error(request->auth_request, AUTH_SUBSYS_DB,
diff --git a/src/lib-imap-client/imapc-client.h b/src/lib-imap-client/imapc-client.h
index ed106d78c7..ea7eae547e 100644
--- a/src/lib-imap-client/imapc-client.h
+++ b/src/lib-imap-client/imapc-client.h
@@ -10,6 +10,7 @@ enum imapc_command_state {
 	IMAPC_COMMAND_STATE_OK,
 	IMAPC_COMMAND_STATE_NO,
 	IMAPC_COMMAND_STATE_BAD,
+	IMAPC_COMMAND_STATE_AUTH_FAILED,
 	IMAPC_COMMAND_STATE_DISCONNECTED
 };
 
diff --git a/src/lib-imap-client/imapc-connection.c b/src/lib-imap-client/imapc-connection.c
index 07d6727333..2fb41ae5ae 100644
--- a/src/lib-imap-client/imapc-connection.c
+++ b/src/lib-imap-client/imapc-connection.c
@@ -164,6 +164,7 @@ imapc_auth_failed(struct imapc_connection *conn, const struct imapc_command_repl
 		  const char *error)
 {
 	struct imapc_command_reply reply = *_reply;
+	reply.state = IMAPC_COMMAND_STATE_AUTH_FAILED;
 	reply.text_without_resp = reply.text_full =
 		t_strdup_printf("Authentication failed: %s", error);
 	i_error("imapc(%s): %s", conn->name, reply.text_full);
diff --git a/src/lib-storage/index/imapc/imapc-mail-fetch.c b/src/lib-storage/index/imapc/imapc-mail-fetch.c
index b5511f9688..e94ed08ee0 100644
--- a/src/lib-storage/index/imapc/imapc-mail-fetch.c
+++ b/src/lib-storage/index/imapc/imapc-mail-fetch.c
@@ -45,6 +45,7 @@ static void imapc_mail_set_failure(struct imapc_mail *mail,
 		break;
 	case IMAPC_COMMAND_STATE_BAD:
 	case IMAPC_COMMAND_STATE_DISCONNECTED:
+	case IMAPC_COMMAND_STATE_AUTH_FAILED:
 		mail->fetch_failed = TRUE;
 		break;
 	}