imap: Add logging details for auth tokens

diff --git a/src/imap/imap-client-hibernate.c b/src/imap/imap-client-hibernate.c
index 93aab2c1f0e96dc9f150cac91b660f637031e633..ad28469668dce86700cc29fdaa35d0bf72c2bcf1 100644 (file)
--- a/src/imap/imap-client-hibernate.c
+++ b/src/imap/imap-client-hibernate.c
@@ -312,9 +312,11 @@ bool imap_client_hibernate(struct client **_client, const char **reason_r)
                /* hide the disconnect log message, because the client didn't
                   actually log out */
                e_debug(e->event(),
-                       "Successfully hibernated imap client in mailbox %s",
+                       "Successfully hibernated imap client in mailbox %s "
+                       "(session_pid=%s auth_token=%s)",
                        client->mailbox == NULL ? "<none>" :
-                       mailbox_get_vname(client->mailbox));
+                       mailbox_get_vname(client->mailbox),
+                       my_pid, client->user->auth_token);
                client->disconnected = TRUE;
                client->hibernated = TRUE;
                client_destroy(client, NULL);

diff --git a/src/imap/imap-master-client.c b/src/imap/imap-master-client.c
index 6763d65b0def5f5055e515cf412489f543cd0e76..987c15f66c39fa732fd56a3a753dcfb5be5558b5 100644 (file)
--- a/src/imap/imap-master-client.c
+++ b/src/imap/imap-master-client.c
@@ -381,7 +381,9 @@ imap_master_client_authenticate(const char *username, const char *session_id,
 
        if (result.error != NULL) {
                *error_r = t_strdup_printf(
-                       "DOVECOT-TOKEN authentication failed: %s", result.error);
+                       "DOVECOT-TOKEN authentication failed: %s "
+                       "(session_pid=%s, token=%s)", result.error, session_pid,
+                       auth_token);
                i_free(result.error);
                return -1;
        }