submission: Remove unnecessary client.session_id

It's also available in client.user.session_id

diff --git a/src/submission/main.c b/src/submission/main.c
index 6b7b8392ac43f3aa97c7ee27993f793216267c0a..93ed82ef95df9afd6de1428dff7154967eb3402f 100644 (file)
--- a/src/submission/main.c
+++ b/src/submission/main.c
@@ -179,7 +179,7 @@ client_create_from_input(const struct mail_storage_service_input *input,
                }
        }
 
-       (void)client_create(fd_in, fd_out, input->session_id, mail_user,
+       (void)client_create(fd_in, fd_out, mail_user,
                            user, set, helo, data, data_len);
        return 0;
 }

diff --git a/src/submission/submission-client.c b/src/submission/submission-client.c
index f871449bdeb5777eadcb1933c7c63f548dad247c..b0d3c045efea833192c209cfd6cd5c4eae44d724 100644 (file)
--- a/src/submission/submission-client.c
+++ b/src/submission/submission-client.c
@@ -176,7 +176,7 @@ static void client_init_urlauth(struct client *client)
        config.url_port = client->set->imap_urlauth_port;
        config.socket_path = t_strconcat(client->user->set->base_dir,
                                         "/"IMAP_URLAUTH_SOCKET_NAME, NULL);
-       config.session_id = client->session_id;
+       config.session_id = client->user->session_id;
        config.access_anonymous = client->user->anonymous;
        config.access_user = client->user->username;
        config.access_service = "submission";
@@ -186,7 +186,7 @@ static void client_init_urlauth(struct client *client)
 }
 
 struct client *client_create(int fd_in, int fd_out,
-                            const char *session_id, struct mail_user *user,
+                            struct mail_user *user,
                             struct mail_storage_service_user *service_user,
                             const struct submission_settings *set,
                             const char *helo,
@@ -211,7 +211,6 @@ struct client *client_create(int fd_in, int fd_out,
        client->user = user;
        client->service_user = service_user;
        client->set = set;
-       client->session_id = p_strdup(pool, session_id);
 
        i_array_init(&client->pending_backends, 4);
        i_array_init(&client->rcpt_to, 8);

diff --git a/src/submission/submission-client.h b/src/submission/submission-client.h
index 0fc46b1cec53ef47c9ed991d7da559c9f12c7ac9..2455d2ee386ea4c464d6f841457096c8f08e08cc 100644 (file)
--- a/src/submission/submission-client.h
+++ b/src/submission/submission-client.h
@@ -78,7 +78,6 @@ struct client {
        pool_t pool;
 
        struct submission_client_vfuncs v;
-       char *session_id;
 
        const struct setting_parser_info *user_set_info;
        const struct submission_settings *set;
@@ -133,7 +132,7 @@ extern struct client *submission_clients;
 extern unsigned int submission_client_count;
 
 struct client *client_create(int fd_in, int fd_out,
-                            const char *session_id, struct mail_user *user,
+                            struct mail_user *user,
                             struct mail_storage_service_user *service_user,
                             const struct submission_settings *set,
                             const char *helo,