Merge pull request #4565 from rjbs/imap-id-log-userid

imap.c: when logging client ID, log userid if authenticated
cyrusimap · Aug 11, 2023 · ac50025 · ac50025
2 parents de94b64 + 64b4133
commit ac50025
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/imap/imapd.c b/imap/imapd.c
@@ -3423,7 +3423,10 @@ static void cmd_id(char *tag)
                 buf_printf(&logbuf, "\"%s\"", val);
         }
 
-        syslog(LOG_INFO, "client id sessionid=<%s>:%s", session_id(), buf_cstring(&logbuf));
+        syslog(LOG_INFO, "client id sessionid=<%s> userid=<%s>:%s",
+                         session_id(),
+                         imapd_userid ? imapd_userid : "",
+                         buf_cstring(&logbuf));
         buf_free(&logbuf);
     }