Skip to content

Commit

Permalink
imapc: Cleanup - Rename auth_error to auth_failed_reason for consistency
Browse files Browse the repository at this point in the history
  • Loading branch information
sirainen authored and villesavolainen committed Jun 13, 2017
1 parent b139348 commit 767e835
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions src/lib-storage/index/imapc/imapc-storage.c
Expand Up @@ -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)
Expand Down Expand Up @@ -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);
}
}
}
Expand Down Expand Up @@ -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);
}

Expand Down
2 changes: 1 addition & 1 deletion src/lib-storage/index/imapc/imapc-storage.h
Expand Up @@ -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;
Expand Down

0 comments on commit 767e835

Please sign in to comment.