dovecot-2.2: lib-fs: Added fs_settings.username and .session_id

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/3f84f9cb7460
changeset: 17612:3f84f9cb7460
user:      Timo Sirainen <tss at iki.fi>
date:      Wed Jul 09 15:24:21 2014 +0300
description:
lib-fs: Added fs_settings.username and .session_id

diffstat:

 src/lib-fs/fs-api.h            |  6 ++++++
 src/lib-storage/mailbox-list.c |  2 ++
 2 files changed, 8 insertions(+), 0 deletions(-)

diffs (28 lines):

diff -r 23f0f5f6a365 -r 3f84f9cb7460 src/lib-fs/fs-api.h
--- a/src/lib-fs/fs-api.h	Wed Jul 09 15:20:59 2014 +0300
+++ b/src/lib-fs/fs-api.h	Wed Jul 09 15:24:21 2014 +0300
@@ -70,6 +70,12 @@
 };
 
 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 -r 23f0f5f6a365 -r 3f84f9cb7460 src/lib-storage/mailbox-list.c
--- a/src/lib-storage/mailbox-list.c	Wed Jul 09 15:20:59 2014 +0300
+++ b/src/lib-storage/mailbox-list.c	Wed Jul 09 15:24:21 2014 +0300
@@ -1825,6 +1825,8 @@
 	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;