submission-login: submission-proxy - Reorder XCLIENT fields to match lib-smtp client.

diff --git a/src/submission-login/submission-proxy.c b/src/submission-login/submission-proxy.c
index 8ca2eefc023b7a347fa1b35f1ea469379fb41d15..b5ff2d6049ba7f9c1381e7d1320d4889a20dee5a 100644 (file)
--- a/src/submission-login/submission-proxy.c
+++ b/src/submission-login/submission-proxy.c
@@ -78,19 +78,19 @@ proxy_send_xclient(struct submission_client *client, struct ostream *output)
        /* remote supports XCLIENT, send it */
        str = t_str_new(128);
        str_append(str, "XCLIENT");
+       if (str_array_icase_find(client->proxy_xclient, "TTL"))
+               str_printfa(str, " TTL=%u", client->common.proxy_ttl - 1);
+       if (str_array_icase_find(client->proxy_xclient, "PORT"))
+               str_printfa(str, " PORT=%u", client->common.remote_port);
        if (str_array_icase_find(client->proxy_xclient, "ADDR")) {
                str_append(str, " ADDR=");
                str_append(str, net_ip2addr(&client->common.ip));
        }
-       if (str_array_icase_find(client->proxy_xclient, "PORT"))
-               str_printfa(str, " PORT=%u", client->common.remote_port);
        if (str_array_icase_find(client->proxy_xclient, "SESSION")) {
                str_append(str, " SESSION=");
                smtp_xtext_encode_cstr(
                        str, client_get_session_id(&client->common));
        }
-       if (str_array_icase_find(client->proxy_xclient, "TTL"))
-               str_printfa(str, " TTL=%u", client->common.proxy_ttl - 1);
        if (str_array_icase_find(client->proxy_xclient, "FORWARD")) {
                buffer_t *fwd = proxy_compose_xclient_forward(client);