From 767e8356e2a3d40f1bbed499e6cefbf1babf6b47 Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Mon, 12 Jun 2017 11:33:38 +0300 Subject: [PATCH] imapc: Cleanup - Rename auth_error to auth_failed_reason for consistency --- src/lib-storage/index/imapc/imapc-storage.c | 6 +++--- src/lib-storage/index/imapc/imapc-storage.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib-storage/index/imapc/imapc-storage.c b/src/lib-storage/index/imapc/imapc-storage.c index f4709b11ef..f770713068 100644 --- a/src/lib-storage/index/imapc/imapc-storage.c +++ b/src/lib-storage/index/imapc/imapc-storage.c @@ -230,7 +230,7 @@ imapc_storage_client_login_callback(const struct imapc_command_reply *reply, } client->auth_failed_state = reply->state; - client->auth_error = i_strdup(reply->text_full); + client->auth_failed_reason = i_strdup(reply->text_full); if (client->_storage != NULL) { if (reply->state == IMAPC_COMMAND_STATE_DISCONNECTED) @@ -268,7 +268,7 @@ static void imapc_storage_client_login(struct imapc_storage_client *client, if (imapc_storage_client_handle_auth_failure(client)) { user->error = p_strdup_printf(user->pool, "imapc: Login to %s failed: %s", - host, client->auth_error); + host, client->auth_failed_reason); } } } @@ -368,7 +368,7 @@ void imapc_storage_client_unref(struct imapc_storage_client **_client) array_foreach_modifiable(&client->untagged_callbacks, cb) i_free(cb->name); array_free(&client->untagged_callbacks); - i_free(client->auth_error); + i_free(client->auth_failed_reason); i_free(client); } diff --git a/src/lib-storage/index/imapc/imapc-storage.h b/src/lib-storage/index/imapc/imapc-storage.h index dad7a1ee41..84b5870d09 100644 --- a/src/lib-storage/index/imapc/imapc-storage.h +++ b/src/lib-storage/index/imapc/imapc-storage.h @@ -55,7 +55,7 @@ struct imapc_storage_client { /* IMAPC_COMMAND_STATE_OK if no auth failure (yet), otherwise result to the LOGIN/AUTHENTICATE command. */ enum imapc_command_state auth_failed_state; - char *auth_error; + char *auth_failed_reason; /* Authentication reply was received (success or failure) */ bool auth_returned:1;