Mercurial > dovecot > core
changeset 26686:f5669cc3a822
imap: Fix setting imap client event's "session" field for CLI sessions
| author | Timo Sirainen <timo.sirainen@open-xchange.com> |
|---|---|
| date | Thu, 21 Nov 2019 15:31:40 +0200 |
| parents | 76a794c05c78 |
| children | fbead1c4dcd3 |
| files | src/imap/main.c |
| diffstat | 1 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/imap/main.c Thu Nov 21 15:30:38 2019 +0200 +++ b/src/imap/main.c Thu Nov 21 15:31:40 2019 +0200 @@ -250,7 +250,6 @@ event_add_category(event, &event_category_imap); event_add_fields(event, (const struct event_add_field []){ { .key = "user", .value = input->username }, - { .key = "session", .value = input->session_id }, { .key = NULL } }); if (input->local_ip.family != 0) @@ -269,6 +268,10 @@ event_unref(&event); return -1; } + /* Add the session only after creating the user, because + input->session_id may be NULL */ + event_add_str(event, "session", mail_user->session_id); + restrict_access_allow_coredumps(TRUE); smtp_set = mail_storage_service_user_get_set(user)[1];