From 09ee37f92d36df64898280bb67e2628a85980a2c Mon Sep 17 00:00:00 2001 From: Marco Bettini Date: Fri, 19 May 2023 08:42:39 +0000 Subject: [PATCH] submission: Drop unused anonymous_allowed fields --- src/submission/submission-client.c | 2 +- src/submission/submission-client.h | 3 --- src/submission/submission-commands.c | 6 +++--- src/submission/submission-recipient.h | 2 -- 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/submission/submission-client.c b/src/submission/submission-client.c index 397d05d26e..20cf39b753 100644 --- a/src/submission/submission-client.c +++ b/src/submission/submission-client.c @@ -261,7 +261,7 @@ client_create(int fd_in, int fd_out, struct event *event, if (hook_client_created != NULL) hook_client_created(&client); - if (user->anonymous && !client->anonymous_allowed) { + if (user->anonymous) { smtp_server_connection_abort( &client->conn, 534, "5.7.9", "Anonymous login is not allowed for submission"); diff --git a/src/submission/submission-client.h b/src/submission/submission-client.h index 74b6058b39..a4f4ff5fb0 100644 --- a/src/submission/submission-client.h +++ b/src/submission/submission-client.h @@ -19,8 +19,6 @@ struct client_state { struct submission_backend *backend; struct istream *data_input; uoff_t data_size; - - bool anonymous_allowed:1; }; struct client_extra_capability { @@ -118,7 +116,6 @@ struct client { bool destroyed:1; bool anvil_sent:1; bool backend_capabilities_configured:1; - bool anonymous_allowed:1; }; struct submission_module_register { diff --git a/src/submission/submission-commands.c b/src/submission/submission-commands.c index 6593f85442..517c716d35 100644 --- a/src/submission/submission-commands.c +++ b/src/submission/submission-commands.c @@ -138,7 +138,7 @@ int client_default_cmd_mail(struct client *client, struct smtp_server_cmd_ctx *cmd, struct smtp_server_cmd_mail *data) { - if (client->user->anonymous && !client->state.anonymous_allowed) { + if (client->user->anonymous) { /* NOTE: may need to allow anonymous BURL access in the future, but while that is not supported, deny all anonymous access explicitly. */ @@ -169,7 +169,7 @@ int client_default_cmd_rcpt(struct client *client ATTR_UNUSED, struct smtp_server_cmd_ctx *cmd, struct submission_recipient *srcpt) { - if (client->user->anonymous && !srcpt->anonymous_allowed) { + if (client->user->anonymous) { /* NOTE: may need to allow anonymous BURL access in the future, but while that is not supported, deny all anonymous access explicitly. */ @@ -275,7 +275,7 @@ int cmd_data_begin(void *conn_ctx, struct istream *inputs[2]; string_t *path; - if (client->user->anonymous && !client->state.anonymous_allowed) { + if (client->user->anonymous) { smtp_server_reply(cmd, 554, "5.7.1", "Access denied (anonymous user)"); return -1; diff --git a/src/submission/submission-recipient.h b/src/submission/submission-recipient.h index d80046f0e5..6af7d044b2 100644 --- a/src/submission/submission-recipient.h +++ b/src/submission/submission-recipient.h @@ -12,8 +12,6 @@ struct submission_recipient { /* Module-specific contexts. */ ARRAY(union submission_recipient_module_context *) module_contexts; - - bool anonymous_allowed:1; }; struct submission_recipient_module_register { -- 2.47.3