imap: Include mail user variables in logout format

diff --git a/src/imap/imap-client.c b/src/imap/imap-client.c
index 76124b36fdc1f52264347d4bd3e7930ac220b292..e8b28160644bc3a1bc6c3e11cce434761c62fedf 100644 (file)
--- a/src/imap/imap-client.c
+++ b/src/imap/imap-client.c
@@ -237,7 +237,7 @@ void client_command_cancel(struct client_command_context **_cmd)
 
 const char *client_stats(struct client *client)
 {
-       const struct var_expand_table tab[] = {
+       const struct var_expand_table logout_tab[] = {
                { 'i', dec2str(i_stream_get_absolute_offset(client->input)), "input" },
                { 'o', dec2str(client->output->offset), "output" },
                { '\0', client->session_id, "session" },
@@ -252,11 +252,17 @@ const char *client_stats(struct client *client)
                { '\0', dec2str(client->append_count), "appended" },
                { '\0', NULL, NULL }
        };
+       const struct var_expand_table *user_tab =
+               mail_user_var_expand_table(client->user);
+       const struct var_expand_table *tab =
+               t_var_expand_merge_tables(logout_tab, user_tab);
        string_t *str;
        const char *error;
 
        str = t_str_new(128);
-       if (var_expand(str, client->set->imap_logout_format, tab, &error) <= 0) {
+       if (var_expand_with_funcs(str, client->set->imap_logout_format,
+                                 tab, mail_user_var_expand_func_table,
+                                 client->user, &error) < 0) {
                i_error("Failed to expand imap_logout_format=%s: %s",
                        client->set->imap_logout_format, error);
        }