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 01595cce540bb9199e92d6d13820e3fbc1facafa..9ccc94b996839008f37583d99a14f56fd458c868 100644 (file)
--- 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 030b88103b7134f40d23552564b204336c214280..74edb73f78134ff6e902fb6f356cdf164410bebf 100644 (file)
--- 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 6046df83ddd01e1e790d8e17e1ce9ce27ad79639..e7f94df077a2759b37c674779ccc81214181f1f0 100644 (file)
--- 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 c1f324a0e85ff9f4f942bb3e1fd3467e9784e00c..1f42f5c7304784b1d6e0eb0ddb8ae3d8e3fcad1f 100644 (file)
--- 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 256059c5fb0f630ddf45cc829db07c9f623b1da7..a0f77c15b55c661e07574e98b4d2205b63af1bda 100644 (file)
--- 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 f0adb9439348eb365ab387a7e3374b271210943c..52b3f2fb36e84242d129fd4c2bb82b3674f4ab78 100644 (file)
--- 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 57e8b7115d18985d6d9cceccbff84c2a636fd775..d3f23c34f30c574f2bf010ecc87acf1577925b21 100644 (file)
--- 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 5ba6ddd996ddcdbae3801d4e1c0b36f1ae6d8b93..e0248cef3ed19d4fb4c628f9a8cbe8088a1c5ba2 100644 (file)
--- 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 1705dcb987d5d6490ea92c856a40a8f979c0f696..597a025a056d9e47ddb4fc456d0d4c2377b814cc 100644 (file)
--- 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 cce61460d3b847e841544b20dc1a589fa0ebed58..0a6f86052ac5d8c60c81d211dbf0064ed1186bce 100644 (file)
--- 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 ac304a67a6225c70a5af00fa6a4f8b09cb67cc7d..0788791a470e979c913efd5dded80d3d99ccf924 100644 (file)
--- 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 4ac88cdc396c29636190e8531ceee21b8134cb7b..6a69ac12746d5cdfc88da94b6693f365abd6a159 100644 (file)
--- 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 817d2522a27a8c3755db3cf2f52dba8eb4688a74..23c4d8695026ed7938fc14d0b745b178408d9874 100644 (file)
--- 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 7a13170c9944857c03ec4383dd5a179d27e4406b..51e08e733eaf2246686039b2a1a910f6a259af52 100644 (file)
--- 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 6f4b460d7b09dc6b7ac54b5ce89dc858a9924c3e..03db5595fb6076513de66462e3aa261b72b53eea 100644 (file)
--- 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 cace1555b5b3028e091c1eb318c37b805c88a19f..79ec6bb2e7c7bb31dfaf309024baca9cfd03f2c2 100644 (file)
--- 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 248b2cf0058aeb3d95acecd8dd5c2c10eecb87de..6dadd81a90953262cb8ecbf7eb98fd2867578309 100644 (file)
--- 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 062a1a6a082765f3c602c6961499da0687d5261d..14346c4bd0a0c1c71aa650c492b879f0ec2cd53c 100644 (file)
--- 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);