imap-login: Forward original client ID to next hop

This will be done if ID is present.

diff --git a/src/imap-login/imap-proxy.c b/src/imap-login/imap-proxy.c
index 1b6b25e65dd6824b83440eef26a85e3be5d0f1fe..eddc7260fb53adaa8074facf0b3752641e899d35 100644 (file)
--- a/src/imap-login/imap-proxy.c
+++ b/src/imap-login/imap-proxy.c
@@ -29,8 +29,13 @@ static void proxy_write_id(struct imap_client *client, string_t *str)
 {
        i_assert(client->common.proxy_ttl > 1);
 
-       str_printfa(str, "I ID ("
-                   "\"x-session-id\" \"%s\" "
+       str_append(str, "I ID (");
+       if (client->common.client_id != NULL &&
+           str_len(client->common.client_id) > 0) {
+               str_append_str(str, client->common.client_id);
+               str_append_c(str, ' ');
+       }
+       str_printfa(str, "\"x-session-id\" \"%s\" "
                    "\"x-originating-ip\" \"%s\" "
                    "\"x-originating-port\" \"%u\" "
                    "\"x-connected-ip\" \"%s\" "