From: Timo Sirainen <tss@iki.fi>
Date: Wed, 9 Jul 2014 12:24:21 +0000 (+0300)
Subject: lib-fs: Added fs_settings.username and .session_id
X-Git-Tag: 2.2.14.rc1~258
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11538e79ae94be5143d0055d4635fcdfd79a3906;p=thirdparty%2Fdovecot%2Fcore.git

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 cb47fbaa13..a1a1f69620 100644
--- 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 c97e51882a..55deb00c53 100644
--- 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;