From: Timo Sirainen Date: Tue, 29 Nov 2022 23:05:32 +0000 (+0200) Subject: lib-storage, global: Remove unused mail_storage_service_input.module X-Git-Tag: 2.4.0~3075 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3797f43ff57d34dc253927e4220b11b77e174cae;p=thirdparty%2Fdovecot%2Fcore.git lib-storage, global: Remove unused mail_storage_service_input.module --- diff --git a/src/doveadm/doveadm-auth-server.c b/src/doveadm/doveadm-auth-server.c index 01595cce54..9ccc94b996 100644 --- a/src/doveadm/doveadm-auth-server.c +++ b/src/doveadm/doveadm-auth-server.c @@ -302,7 +302,6 @@ cmd_user_mail_input(struct mail_storage_service_ctx *storage_service, int ret; i_zero(&service_input); - service_input.module = "mail"; service_input.service = input->info.service; service_input.username = input->username; service_input.local_ip = input->info.local_ip; diff --git a/src/doveadm/doveadm-auth.c b/src/doveadm/doveadm-auth.c index 030b88103b..74edb73f78 100644 --- a/src/doveadm/doveadm-auth.c +++ b/src/doveadm/doveadm-auth.c @@ -637,7 +637,6 @@ cmd_user_mail_input(struct mail_storage_service_ctx *storage_service, int ret; i_zero(&service_input); - service_input.module = "mail"; service_input.service = input->info.service; service_input.username = input->username; service_input.local_ip = input->info.local_ip; diff --git a/src/doveadm/doveadm-mail-import.c b/src/doveadm/doveadm-mail-import.c index 6046df83dd..e7f94df077 100644 --- a/src/doveadm/doveadm-mail-import.c +++ b/src/doveadm/doveadm-mail-import.c @@ -166,7 +166,6 @@ static void cmd_import_init_source_user(struct import_cmd_context *ctx, struct m /* create a user for accessing the source storage */ i_zero(&input); - input.module = "mail"; input.username = ctx->src_username != NULL ? ctx->src_username : dest_user->username; diff --git a/src/imap-urlauth/imap-urlauth-worker.c b/src/imap-urlauth/imap-urlauth-worker.c index c1f324a0e8..1f42f5c730 100644 --- a/src/imap-urlauth/imap-urlauth-worker.c +++ b/src/imap-urlauth/imap-urlauth-worker.c @@ -559,7 +559,6 @@ client_handle_user_command(struct client *client, const char *cmd, /* lookup user */ i_zero(&input); - input.module = "imap-urlauth-worker"; input.service = "imap-urlauth-worker"; input.username = args[0]; input.event_parent = client->event; diff --git a/src/imap/imap-master-client.c b/src/imap/imap-master-client.c index 256059c5fb..a0f77c15b5 100644 --- a/src/imap/imap-master-client.c +++ b/src/imap/imap-master-client.c @@ -68,7 +68,7 @@ imap_master_client_parse_input(const char *const *args, pool_t pool, master_input_r->client_output = buffer_create_dynamic(pool, 16); master_input_r->state = buffer_create_dynamic(pool, 512); - input_r->module = input_r->service = "imap"; + input_r->service = "imap"; /* we never want to do userdb lookup again when restoring the client. we have the userdb_fields cached already. */ input_r->flags_override_remove = MAIL_STORAGE_SERVICE_FLAG_USERDB_LOOKUP; diff --git a/src/imap/main.c b/src/imap/main.c index f0adb94393..52b3f2fb36 100644 --- a/src/imap/main.c +++ b/src/imap/main.c @@ -300,7 +300,7 @@ static void main_stdio_run(const char *username) const char *value, *error, *input_base64; i_zero(&input); - input.module = input.service = "imap"; + input.service = "imap"; input.username = username != NULL ? username : getenv("USER"); if (input.username == NULL && IS_STANDALONE()) input.username = getlogin(); @@ -353,7 +353,7 @@ login_request_finished(const struct login_server_request *request, const char *error; i_zero(&input); - input.module = input.service = "imap"; + input.service = "imap"; input.local_ip = request->auth_req.local_ip; input.remote_ip = request->auth_req.remote_ip; input.local_port = request->auth_req.local_port; diff --git a/src/indexer/master-connection.c b/src/indexer/master-connection.c index 57e8b7115d..d3f23c34f3 100644 --- a/src/indexer/master-connection.c +++ b/src/indexer/master-connection.c @@ -262,7 +262,6 @@ master_connection_cmd_index(struct master_connection *conn, int ret; i_zero(&input); - input.module = "mail"; input.service = "indexer-worker"; input.username = username; /* if session-id is given, use it as a prefix to a unique session ID. diff --git a/src/lda/main.c b/src/lda/main.c index 5ba6ddd996..e0248cef3e 100644 --- a/src/lda/main.c +++ b/src/lda/main.c @@ -519,7 +519,6 @@ int main(int argc, char *argv[]) dinput.event_parent = event; i_zero(&service_input); - service_input.module = "lda"; service_input.service = "lda"; service_input.username = user; service_input.event_parent = event; diff --git a/src/lib-storage/mail-storage-service.h b/src/lib-storage/mail-storage-service.h index 1705dcb987..597a025a05 100644 --- a/src/lib-storage/mail-storage-service.h +++ b/src/lib-storage/mail-storage-service.h @@ -39,7 +39,6 @@ enum mail_storage_service_flags { struct mail_storage_service_input { struct event *event_parent; - const char *module; const char *service; const char *username; /* If set, use this string as the session ID */ diff --git a/src/lmtp/lmtp-client.c b/src/lmtp/lmtp-client.c index cce61460d3..0a6f86052a 100644 --- a/src/lmtp/lmtp-client.c +++ b/src/lmtp/lmtp-client.c @@ -106,7 +106,7 @@ static void client_read_settings(struct client *client, bool ssl) const char *error; i_zero(&input); - input.module = input.service = "lmtp"; + input.service = "lmtp"; input.local_ip = client->local_ip; input.remote_ip = client->remote_ip; input.local_port = client->local_port; diff --git a/src/lmtp/lmtp-local.c b/src/lmtp/lmtp-local.c index ac304a67a6..0788791a47 100644 --- a/src/lmtp/lmtp-local.c +++ b/src/lmtp/lmtp-local.c @@ -299,7 +299,7 @@ int lmtp_local_rcpt(struct client *client, int ret = 0; i_zero(&input); - input.module = input.service = "lmtp"; + input.service = "lmtp"; input.username = username; input.local_ip = client->local_ip; input.remote_ip = client->remote_ip; diff --git a/src/lmtp/lmtp-proxy.c b/src/lmtp/lmtp-proxy.c index 4ac88cdc39..6a69ac1274 100644 --- a/src/lmtp/lmtp-proxy.c +++ b/src/lmtp/lmtp-proxy.c @@ -931,7 +931,7 @@ int lmtp_proxy_rcpt(struct client *client, lrcpt->backend_context = lprcpt; i_zero(&input); - input.module = input.service = "lmtp"; + input.service = "lmtp"; mail_storage_service_init_settings(storage_service, &input); lmtp_proxy_rcpt_init_auth_user_info(lrcpt, &info); diff --git a/src/plugins/mail-crypt/doveadm-mail-crypt.c b/src/plugins/mail-crypt/doveadm-mail-crypt.c index 817d2522a2..23c4d86950 100644 --- a/src/plugins/mail-crypt/doveadm-mail-crypt.c +++ b/src/plugins/mail-crypt/doveadm-mail-crypt.c @@ -88,7 +88,6 @@ mcp_user_create(struct mail_user *user, const char *dest_username, io_loop_context_deactivate(cur_ioloop_ctx); i_zero(&input); - input.module = old_input->module; input.service = old_input->service; input.username = dest_username; input.session_id_prefix = user->session_id; diff --git a/src/plugins/mail-crypt/mail-crypt-acl-plugin.c b/src/plugins/mail-crypt/mail-crypt-acl-plugin.c index 7a13170c99..51e08e733e 100644 --- a/src/plugins/mail-crypt/mail-crypt-acl-plugin.c +++ b/src/plugins/mail-crypt/mail-crypt-acl-plugin.c @@ -157,7 +157,6 @@ mail_crypt_acl_user_create(struct mail_user *user, const char *dest_username, io_loop_context_deactivate(cur_ioloop_ctx); i_zero(&input); - input.module = old_input->module; input.service = old_input->service; input.username = dest_username; input.session_id_prefix = user->session_id; diff --git a/src/plugins/quota/quota-status.c b/src/plugins/quota/quota-status.c index 6f4b460d7b..03db5595fb 100644 --- a/src/plugins/quota/quota-status.c +++ b/src/plugins/quota/quota-status.c @@ -292,7 +292,6 @@ static void main_init(void) i_zero(&input); input.service = "quota-status"; - input.module = "mail"; input.username = ""; quota_status_pool = pool_alloconly_create("quota status settings", 512); diff --git a/src/pop3/main.c b/src/pop3/main.c index cace1555b5..79ec6bb2e7 100644 --- a/src/pop3/main.c +++ b/src/pop3/main.c @@ -250,7 +250,7 @@ static void main_stdio_run(const char *username) const char *value, *error, *input_base64; i_zero(&input); - input.module = input.service = "pop3"; + input.service = "pop3"; input.username = username != NULL ? username : getenv("USER"); if (input.username == NULL && IS_STANDALONE()) input.username = getlogin(); @@ -286,7 +286,7 @@ login_request_finished(const struct login_server_request *login_client, buffer_t input_buf; i_zero(&input); - input.module = input.service = "pop3"; + input.service = "pop3"; input.local_ip = login_client->auth_req.local_ip; input.remote_ip = login_client->auth_req.remote_ip; input.local_port = login_client->auth_req.local_port; diff --git a/src/submission/main.c b/src/submission/main.c index 248b2cf005..6dadd81a90 100644 --- a/src/submission/main.c +++ b/src/submission/main.c @@ -239,7 +239,7 @@ static void main_stdio_run(const char *username) const char *value, *error, *input_base64; i_zero(&input); - input.module = input.service = "submission"; + input.service = "submission"; input.username = username != NULL ? username : getenv("USER"); if (input.username == NULL && IS_STANDALONE()) input.username = getlogin(); @@ -269,7 +269,7 @@ login_request_finished(const struct login_server_request *request, buffer_t input_buf; i_zero(&input); - input.module = input.service = "submission"; + input.service = "submission"; input.local_ip = request->auth_req.local_ip; input.remote_ip = request->auth_req.remote_ip; input.local_port = request->auth_req.local_port; diff --git a/src/util/script-login.c b/src/util/script-login.c index 062a1a6a08..14346c4bd0 100644 --- a/src/util/script-login.c +++ b/src/util/script-login.c @@ -91,7 +91,6 @@ static void client_connected(struct master_service_connection *conn) i = 0; i_zero(&input); - input.module = "mail"; /* need to get mail_uid, mail_gid */ input.service = "script-login"; (void)net_addr2ip(args[i++], &input.local_ip); (void)net_addr2ip(args[i++], &input.remote_ip);