Mercurial > dovecot > core-2.2
changeset 21769:6985bf43b94f
imap-login: Forward original client ID to next hop
This will be done if ID is present.
| author | Aki Tuomi <aki.tuomi@dovecot.fi> |
|---|---|
| date | Thu, 16 Mar 2017 10:01:23 +0200 |
| parents | a1bf55c221c2 |
| children | ace143d416d1 |
| files | src/imap-login/imap-proxy.c |
| diffstat | 1 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/imap-login/imap-proxy.c Mon Feb 20 19:11:01 2017 +0200 +++ b/src/imap-login/imap-proxy.c Thu Mar 16 10:01:23 2017 +0200 @@ -29,8 +29,13 @@ { 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\" "