pop3: Remove unnecessary client.session_id

It's also available in client.user.session_id

diff --git a/src/pop3/main.c b/src/pop3/main.c
index 285e74e36e1a42c221128bdb8c6fcf9133c3cda9..588ef77b947795e4ca83a176017a0d12d00d3575 100644 (file)
--- a/src/pop3/main.c
+++ b/src/pop3/main.c
@@ -129,9 +129,7 @@ client_create_from_input(const struct mail_storage_service_input *input,
                return -1;
        }
 
-       *client_r = client_create(fd_in, fd_out, input->session_id,
-                                 mail_user, user, set);
-
+       *client_r = client_create(fd_in, fd_out, mail_user, user, set);
        return 0;
 }
 

diff --git a/src/pop3/pop3-client.c b/src/pop3/pop3-client.c
index fe45f000910eb2d7ec586d2d73da42f69042e544..685fd621cffa7fc83bbf3183996f1d481e037198 100644 (file)
--- a/src/pop3/pop3-client.c
+++ b/src/pop3/pop3-client.c
@@ -375,7 +375,7 @@ int pop3_lock_session(struct client *client)
        return ret;
 }
 
-struct client *client_create(int fd_in, int fd_out, const char *session_id,
+struct client *client_create(int fd_in, int fd_out,
                             struct mail_user *user,
                             struct mail_storage_service_user *service_user,
                             const struct pop3_settings *set)
@@ -393,7 +393,6 @@ struct client *client_create(int fd_in, int fd_out, const char *session_id,
        client->service_user = service_user;
        client->v = pop3_client_vfuncs;
        client->set = set;
-       client->session_id = p_strdup(pool, session_id);
        client->fd_in = fd_in;
        client->fd_out = fd_out;
        client->input = i_stream_create_fd(fd_in, MAX_INBUF_SIZE);

diff --git a/src/pop3/pop3-client.h b/src/pop3/pop3-client.h
index 51af0793ceeae29986c2fd824abe97734038e711..b6f666ee9ef5394578588514dc99a64bfa19b1fd 100644 (file)
--- a/src/pop3/pop3-client.h
+++ b/src/pop3/pop3-client.h
@@ -34,7 +34,6 @@ struct client {
        struct client *prev, *next;
 
        struct pop3_client_vfuncs v;
-       const char *session_id;
 
        int fd_in, fd_out;
        struct io *io;
@@ -121,7 +120,7 @@ extern unsigned int pop3_client_count;
 
 /* Create new client with specified input/output handles. socket specifies
    if the handle is a socket. */
-struct client *client_create(int fd_in, int fd_out, const char *session_id,
+struct client *client_create(int fd_in, int fd_out,
                             struct mail_user *user,
                             struct mail_storage_service_user *service_user,
                             const struct pop3_settings *set);