From: Stephan Bosch Date: Wed, 5 Nov 2025 16:37:16 +0000 (+0100) Subject: submission-login: Rename client->pending_auth to client->auth_cmd X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c317b4d0f4eb2be85d8299fd233a99765d7eab39;p=thirdparty%2Fdovecot%2Fcore.git submission-login: Rename client->pending_auth to client->auth_cmd --- diff --git a/src/submission-login/client-authenticate.c b/src/submission-login/client-authenticate.c index fed80dfad1..39a63f8916 100644 --- a/src/submission-login/client-authenticate.c +++ b/src/submission-login/client-authenticate.c @@ -120,19 +120,19 @@ void submission_client_auth_result(struct client *client, { struct submission_client *subm_client = container_of(client, struct submission_client, common); - struct smtp_server_cmd_ctx *cmd = subm_client->pending_auth; + struct smtp_server_cmd_ctx *cmd = subm_client->auth_cmd; if (subm_client->conn == NULL) return; - subm_client->pending_auth = NULL; + subm_client->auth_cmd = NULL; i_assert(cmd != NULL); switch (result) { case CLIENT_AUTH_RESULT_SUCCESS: /* nothing to be done for SMTP */ if (client->login_proxy != NULL) - subm_client->pending_auth = cmd; + subm_client->auth_cmd = cmd; break; case CLIENT_AUTH_RESULT_REFERRAL_NOLOGIN: { const struct smtp_proxy_redirect predir = { @@ -285,7 +285,7 @@ void submission_client_auth_send_challenge(struct client *client, { struct submission_client *subm_client = container_of(client, struct submission_client, common); - struct smtp_server_cmd_ctx *cmd = subm_client->pending_auth; + struct smtp_server_cmd_ctx *cmd = subm_client->auth_cmd; i_assert(cmd != NULL); @@ -337,8 +337,8 @@ int cmd_auth(void *conn_ctx, struct smtp_server_cmd_ctx *cmd, cmd_auth_set_master_data_prefix(subm_client, NULL); - i_assert(subm_client->pending_auth == NULL); - subm_client->pending_auth = cmd; + i_assert(subm_client->auth_cmd == NULL); + subm_client->auth_cmd = cmd; (void)client_auth_begin(client, data->sasl_mech, data->initial_response); return 0; @@ -369,8 +369,8 @@ void cmd_mail(struct smtp_server_cmd_ctx *cmd, const char *params) cmd_auth_set_master_data_prefix(subm_client, params); - i_assert(subm_client->pending_auth == NULL); - subm_client->pending_auth = cmd; + i_assert(subm_client->auth_cmd == NULL); + subm_client->auth_cmd = cmd; (void)client_auth_begin_implicit(client, SASL_MECH_NAME_EXTERNAL, "="); } diff --git a/src/submission-login/client.c b/src/submission-login/client.c index 7d8b37e09a..1d920d1524 100644 --- a/src/submission-login/client.c +++ b/src/submission-login/client.c @@ -242,7 +242,7 @@ static void client_connection_disconnect(void *context, const char *reason) { struct submission_client *client = context; - client->pending_auth = NULL; + client->auth_cmd = NULL; client_disconnect(&client->common, reason); } diff --git a/src/submission-login/client.h b/src/submission-login/client.h index e5b9fb6ef7..731d912d95 100644 --- a/src/submission-login/client.h +++ b/src/submission-login/client.h @@ -25,7 +25,7 @@ struct submission_client { enum smtp_capability backend_capabilities; struct smtp_server_connection *conn; - struct smtp_server_cmd_ctx *pending_auth; + struct smtp_server_cmd_ctx *auth_cmd; enum submission_proxy_state proxy_state; enum smtp_capability proxy_capability; diff --git a/src/submission-login/submission-proxy.c b/src/submission-login/submission-proxy.c index 67be832d23..aa5534b9c8 100644 --- a/src/submission-login/submission-proxy.c +++ b/src/submission-login/submission-proxy.c @@ -301,7 +301,7 @@ static int proxy_handle_ehlo_reply(struct submission_client *client, struct ostream *output) { - struct smtp_server_cmd_ctx *cmd = client->pending_auth; + struct smtp_server_cmd_ctx *cmd = client->auth_cmd; int ret; switch (client->proxy_state) { @@ -337,7 +337,7 @@ proxy_handle_ehlo_reply(struct submission_client *client, smtp_server_command_add_hook( cmd->cmd, SMTP_SERVER_COMMAND_HOOK_DESTROY, submission_proxy_success_reply_sent, client); - client->pending_auth = NULL; + client->auth_cmd = NULL; smtp_server_reply(cmd, 235, "2.7.0", "Logged in."); return 1; @@ -491,7 +491,7 @@ int submission_proxy_parse_line(struct client *client, const char *line) { struct submission_client *subm_client = container_of(client, struct submission_client, common); - struct smtp_server_cmd_ctx *cmd = subm_client->pending_auth; + struct smtp_server_cmd_ctx *cmd = subm_client->auth_cmd; struct smtp_server_command *command = cmd->cmd; struct ostream *output; bool last_line = FALSE, invalid_line = FALSE; @@ -649,7 +649,7 @@ int submission_proxy_parse_line(struct client *client, const char *line) command, SMTP_SERVER_COMMAND_HOOK_DESTROY, submission_proxy_success_reply_sent, subm_client); - subm_client->pending_auth = NULL; + subm_client->auth_cmd = NULL; /* Login successful. Send this reply to client. */ smtp_server_reply_submit(subm_client->proxy_reply); @@ -683,7 +683,7 @@ int submission_proxy_parse_line(struct client *client, const char *line) i_assert((status / 100) != 2); i_assert(subm_client->proxy_reply != NULL); smtp_server_reply_submit(subm_client->proxy_reply); - subm_client->pending_auth = NULL; + subm_client->auth_cmd = NULL; } login_proxy_failed(client->login_proxy, @@ -710,7 +710,7 @@ submission_proxy_send_failure_reply(struct submission_client *subm_client, enum login_proxy_failure_type type, const char *reason ATTR_UNUSED) { - struct smtp_server_cmd_ctx *cmd = subm_client->pending_auth; + struct smtp_server_cmd_ctx *cmd = subm_client->auth_cmd; switch (type) { case LOGIN_PROXY_FAILURE_TYPE_CONNECT: @@ -722,12 +722,12 @@ submission_proxy_send_failure_reply(struct submission_client *subm_client, case LOGIN_PROXY_FAILURE_TYPE_AUTH_REDIRECT: case LOGIN_PROXY_FAILURE_TYPE_AUTH_NOT_REPLIED: i_assert(cmd != NULL); - subm_client->pending_auth = NULL; + subm_client->auth_cmd = NULL; smtp_server_reply(cmd, 454, "4.7.0", LOGIN_PROXY_FAILURE_MSG); break; case LOGIN_PROXY_FAILURE_TYPE_AUTH_TEMPFAIL: i_assert(cmd != NULL); - subm_client->pending_auth = NULL; + subm_client->auth_cmd = NULL; i_assert(subm_client->proxy_reply != NULL); smtp_server_reply_submit(subm_client->proxy_reply);