From: Stephan Bosch <stephan.bosch@open-xchange.com>
Date: Mon, 5 Jul 2021 21:33:51 +0000 (+0200)
Subject: submission-login: submission-proxy - Reorder XCLIENT fields to match lib-smtp client.
X-Git-Tag: 2.3.17~277
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3764af4b4236ec05e29ecd03bd9e41a174c92197;p=thirdparty%2Fdovecot%2Fcore.git

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 8ca2eefc02..b5ff2d6049 100644
--- 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);