lib-fs: Added fs_settings.username and .session_id

diff --git a/src/lib-fs/fs-api.h b/src/lib-fs/fs-api.h
index cb47fbaa13c4c0a5b2f34446d8d28a74e035a38a..a1a1f69620f7994b474f0d2c8576d05d78a9533c 100644 (file)
--- a/src/lib-fs/fs-api.h
+++ b/src/lib-fs/fs-api.h
@@ -70,6 +70,12 @@ enum fs_iter_flags {
 };
 
 struct fs_settings {
+       /* Username and session ID are mainly used for debugging/logging,
+          but may also be useful for other purposes if they exist (they
+          may be NULL). */
+       const char *username;
+       const char *session_id;
+
        /* Dovecot instance's base_dir */
        const char *base_dir;
        /* Directory where temporary files can be created at any time

diff --git a/src/lib-storage/mailbox-list.c b/src/lib-storage/mailbox-list.c
index c97e51882ac9c53c58641316db2aca5446b3ace5..55deb00c538b364a0580136c154753213acff625 100644 (file)
--- a/src/lib-storage/mailbox-list.c
+++ b/src/lib-storage/mailbox-list.c
@@ -1825,6 +1825,8 @@ int mailbox_list_init_fs(struct mailbox_list *list, const char *driver,
        ssl_set.ca_file = list->mail_set->ssl_client_ca_file;
 
        memset(&fs_set, 0, sizeof(fs_set));
+       fs_set.username = list->ns->user->username;
+       fs_set.session_id = list->ns->user->session_id;
        fs_set.temp_file_prefix = mailbox_list_get_global_temp_prefix(list);
        fs_set.base_dir = list->ns->user->set->base_dir;
        fs_set.temp_dir = list->ns->user->set->mail_temp_dir;