lib-storage, global: Rename mail_user._service_user to service_user

It's now always set, so the underscore isn't useful.

diff --git a/src/lda/main.c b/src/lda/main.c
index 2b8b74e3fb0985538e33f87c958f1e8a6599cd9c..a95f194a8ad79f6aa742c0af43746897043a3ad8 100644 (file)
--- a/src/lda/main.c
+++ b/src/lda/main.c
@@ -154,7 +154,7 @@ lda_raw_mail_open(struct mail_deliver_input *dinput, const char *path)
        int ret;
 
        struct mail_storage_service_ctx *storage_service =
-               mail_storage_service_user_get_service_ctx(dinput->rcpt_user->_service_user);
+               mail_storage_service_user_get_service_ctx(dinput->rcpt_user->service_user);
        raw_mail_user = raw_storage_create_from_set(storage_service,
                                dinput->rcpt_user->unexpanded_set_parser);
 

diff --git a/src/lib-storage/index/shared/shared-storage.c b/src/lib-storage/index/shared/shared-storage.c
index 3fe2e290f1057752f560dc84f1a0650d85653ce5..5c6d39f8a18e1f224bd3dd3271ab5711d658d62f 100644 (file)
--- a/src/lib-storage/index/shared/shared-storage.c
+++ b/src/lib-storage/index/shared/shared-storage.c
@@ -255,9 +255,9 @@ int shared_storage_get_namespace(struct mail_namespace **_ns,
        struct ioloop_context *old_ioloop_ctx =
                io_loop_get_current_context(current_ioloop);
        struct mail_storage_service_ctx *storage_service =
-               mail_storage_service_user_get_service_ctx(user->_service_user);
+               mail_storage_service_user_get_service_ctx(user->service_user);
        struct event *service_user_event =
-               mail_storage_service_user_get_event(user->_service_user);
+               mail_storage_service_user_get_event(user->service_user);
        const struct mail_storage_service_input input = {
                .event_parent = event_get_parent(service_user_event),
                .username = userdomain,

diff --git a/src/lib-storage/mail-user.c b/src/lib-storage/mail-user.c
index a93fc39fbbd80258cede81b4eefb76a287f3fcb1..505d4130d03308fe87823c4484fbe370d07895af 100644 (file)
--- a/src/lib-storage/mail-user.c
+++ b/src/lib-storage/mail-user.c
@@ -40,8 +40,7 @@ static void mail_user_deinit_base(struct mail_user *user)
                dict_deinit(&user->_attr_dict);
        }
        mail_namespaces_deinit(&user->namespaces);
-       if (user->_service_user != NULL)
-               mail_storage_service_user_unref(&user->_service_user);
+       mail_storage_service_user_unref(&user->service_user);
 }
 
 static void mail_user_deinit_pre_base(struct mail_user *user ATTR_UNUSED)
@@ -63,7 +62,7 @@ mail_user_alloc_int(struct mail_storage_service_user *service_user,
        user = p_new(pool, struct mail_user, 1);
        user->pool = pool;
        user->refcount = 1;
-       user->_service_user = service_user;
+       user->service_user = service_user;
        mail_storage_service_user_ref(service_user);
        user->username = p_strdup(pool, username);
        user->unexpanded_set_parser = unexpanded_set_parser;
@@ -165,9 +164,7 @@ int mail_user_init(struct mail_user *user, const char **error_r)
        i_assert(!user->initialized);
 
        struct mail_storage_service_ctx *service_ctx =
-               user->_service_user != NULL ?
-               mail_storage_service_user_get_service_ctx(user->_service_user) :
-               mail_storage_service_get_global();
+               mail_storage_service_user_get_service_ctx(user->service_user);
        const struct setting_parser_info *const *set_roots =
                mail_storage_service_get_set_roots(service_ctx);
        for (unsigned int i = 0; set_roots[i] != NULL; i++) {
@@ -770,7 +767,7 @@ struct mail_user *mail_user_dup(struct mail_user *user)
 {
        struct mail_user *user2;
 
-       user2 = mail_user_alloc(user->_service_user,
+       user2 = mail_user_alloc(user->service_user,
                                user->unexpanded_set_parser);
        if (user->_home != NULL)
                mail_user_set_home(user2, user->_home);
@@ -792,15 +789,8 @@ struct mail_user *mail_user_dup(struct mail_user *user)
 void mail_user_init_ssl_client_settings(struct mail_user *user,
        struct ssl_iostream_settings *ssl_set_r)
 {
-       if (user->_service_user == NULL) {
-               /* Internal test user that should never actually need any
-                  SSL settings. */
-               i_zero(ssl_set_r);
-               return;
-       }
-
        const struct master_service_ssl_settings *ssl_set =
-               mail_storage_service_user_get_ssl_settings(user->_service_user);
+               mail_storage_service_user_get_ssl_settings(user->service_user);
 
        master_service_ssl_client_settings_to_iostream_set(ssl_set,
                pool_datastack_create(), ssl_set_r);

diff --git a/src/lib-storage/mail-user.h b/src/lib-storage/mail-user.h
index e72dc4eca7d1d4139094bc86c7d40b46acbb7d31..557c5aff98307f3539324c9d1c9e0d05b2ebfed0 100644 (file)
--- a/src/lib-storage/mail-user.h
+++ b/src/lib-storage/mail-user.h
@@ -34,8 +34,7 @@ struct mail_user {
        /* User's creator if such exists. For example for autocreated shared
           mailbox users their creator is the logged in user. */
        struct mail_user *creator;
-       /* Set if user was created via mail_storage_service. */
-       struct mail_storage_service_user *_service_user;
+       struct mail_storage_service_user *service_user;
 
        const char *username;
        /* don't access the home directly. It may be set lazily. */

diff --git a/src/lmtp/lmtp-local.c b/src/lmtp/lmtp-local.c
index 39ea63dc6e3d81092442bb00a40142510b857cbc..ac304a67a6225c70a5af00fa6a4f8b09cb67cc7d 100644 (file)
--- a/src/lmtp/lmtp-local.c
+++ b/src/lmtp/lmtp-local.c
@@ -636,20 +636,20 @@ lmtp_local_deliver_to_rcpts(struct lmtp_local *local,
                    (ret != 0 && local->rcpt_user != NULL)) {
                        if (i == (count - 1))
                                mail_user_autoexpunge(local->rcpt_user);
-                       mail_storage_service_io_deactivate_user(local->rcpt_user->_service_user);
+                       mail_storage_service_io_deactivate_user(local->rcpt_user->service_user);
                        mail_user_deinit(&local->rcpt_user);
                } else if (ret == 0) {
                        /* use the first saved message to save it elsewhere too.
                           this might allow hard linking the files.
                           mail_user is saved in first_saved_mail,
                           will be unreferenced later on */
-                       mail_storage_service_io_deactivate_user(local->rcpt_user->_service_user);
+                       mail_storage_service_io_deactivate_user(local->rcpt_user->service_user);
                        local->rcpt_user = NULL;
                        src_mail = local->first_saved_mail;
                        first_uid = geteuid();
                        i_assert(first_uid != 0);
                } else if (local->rcpt_user != NULL) {
-                       mail_storage_service_io_deactivate_user(local->rcpt_user->_service_user);
+                       mail_storage_service_io_deactivate_user(local->rcpt_user->service_user);
                }
        }
        return first_uid;
@@ -722,12 +722,12 @@ void lmtp_local_data(struct client *client,
                                i_fatal("seteuid() failed: %m");
                }
 
-               mail_storage_service_io_activate_user(user->_service_user);
+               mail_storage_service_io_activate_user(user->service_user);
                mail_free(&mail);
                mailbox_transaction_rollback(&trans);
                mailbox_free(&box);
                mail_user_autoexpunge(user);
-               mail_storage_service_io_deactivate_user(user->_service_user);
+               mail_storage_service_io_deactivate_user(user->service_user);
                mail_user_deinit(&user);
        }
 

diff --git a/src/plugins/mail-crypt/doveadm-mail-crypt.c b/src/plugins/mail-crypt/doveadm-mail-crypt.c
index db54f83fe1ff3072b945dbc9b1c071badfca6b18..24af6fcb9e586c0ac96e2cdb78a92a61a1138754 100644 (file)
--- a/src/plugins/mail-crypt/doveadm-mail-crypt.c
+++ b/src/plugins/mail-crypt/doveadm-mail-crypt.c
@@ -82,9 +82,8 @@ mcp_user_create(struct mail_user *user, const char *dest_username,
 
        int ret;
 
-       i_assert(user->_service_user != NULL);
-       service_ctx = mail_storage_service_user_get_service_ctx(user->_service_user);
-       old_input = mail_storage_service_user_get_input(user->_service_user);
+       service_ctx = mail_storage_service_user_get_service_ctx(user->service_user);
+       old_input = mail_storage_service_user_get_input(user->service_user);
 
        if ((cur_ioloop_ctx = io_loop_get_current_context(current_ioloop)) != NULL)
                io_loop_context_deactivate(cur_ioloop_ctx);
@@ -129,7 +128,7 @@ mcp_update_shared_key(struct mailbox_transaction_context *t,
        /* to make sure we get correct logging context */
        if (ret > 0)
                mail_storage_service_io_deactivate_user(dest_service_user);
-       mail_storage_service_io_activate_user(user->_service_user);
+       mail_storage_service_io_activate_user(user->service_user);
 
        if (ret <= 0) {
                e_error(user->event, "Cannot initialize destination user %s: %s",
@@ -166,7 +165,7 @@ mcp_update_shared_key(struct mailbox_transaction_context *t,
        }
 
        /* logging context swap again */
-       mail_storage_service_io_deactivate_user(user->_service_user);
+       mail_storage_service_io_deactivate_user(user->service_user);
        mail_storage_service_io_activate_user(dest_service_user);
 
        mail_user_deinit(&dest_user);
@@ -175,7 +174,7 @@ mcp_update_shared_key(struct mailbox_transaction_context *t,
        if ((cur_ioloop_ctx = io_loop_get_current_context(current_ioloop)) != NULL)
                io_loop_context_deactivate(cur_ioloop_ctx);
 
-       mail_storage_service_io_activate_user(user->_service_user);
+       mail_storage_service_io_activate_user(user->service_user);
 
        return ret;
 }

diff --git a/src/plugins/mail-crypt/mail-crypt-acl-plugin.c b/src/plugins/mail-crypt/mail-crypt-acl-plugin.c
index f5842d87ba9a7bf70b4819dbffc4c531cd3c9711..656efe99139c1fae2ed296cd7516dec89f83b6f2 100644 (file)
--- a/src/plugins/mail-crypt/mail-crypt-acl-plugin.c
+++ b/src/plugins/mail-crypt/mail-crypt-acl-plugin.c
@@ -151,9 +151,8 @@ mail_crypt_acl_user_create(struct mail_user *user, const char *dest_username,
 
        int ret;
 
-       i_assert(user->_service_user != NULL);
-       service_ctx = mail_storage_service_user_get_service_ctx(user->_service_user);
-       old_input = mail_storage_service_user_get_input(user->_service_user);
+       service_ctx = mail_storage_service_user_get_service_ctx(user->service_user);
+       old_input = mail_storage_service_user_get_input(user->service_user);
 
        if ((cur_ioloop_ctx = io_loop_get_current_context(current_ioloop)) != NULL)
                io_loop_context_deactivate(cur_ioloop_ctx);
@@ -287,7 +286,7 @@ static int mail_crypt_acl_object_update(struct acl_object *aclobj,
                if (ret > 0)
                        mail_storage_service_io_deactivate_user(dest_service_user);
                mail_storage_service_io_activate_user(
-                       aclobj->backend->list->ns->user->_service_user
+                       aclobj->backend->list->ns->user->service_user
                );
 
                if (ret <= 0) {
@@ -316,7 +315,7 @@ static int mail_crypt_acl_object_update(struct acl_object *aclobj,
 
                /* logging context swap again */
                mail_storage_service_io_deactivate_user(
-                       aclobj->backend->list->ns->user->_service_user
+                       aclobj->backend->list->ns->user->service_user
                );
                mail_storage_service_io_activate_user(dest_service_user);
 
@@ -326,7 +325,7 @@ static int mail_crypt_acl_object_update(struct acl_object *aclobj,
                if ((cur_ioloop_ctx = io_loop_get_current_context(current_ioloop)) != NULL)
                        io_loop_context_deactivate(cur_ioloop_ctx);
                mail_storage_service_io_activate_user(
-                       aclobj->backend->list->ns->user->_service_user
+                       aclobj->backend->list->ns->user->service_user
                );
                break;
        case ACL_ID_OWNER: