From: Stephan Bosch <stephan.bosch@open-xchange.com>
Date: Thu, 12 Dec 2019 08:31:48 +0000 (+0100)
Subject: submission-login: submission-proxy - Properly encode XCLIENT command arguments.
X-Git-Tag: 2.3.10~131
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af1cf60a865d47a48862b556918419bd82a25ad8;p=thirdparty%2Fdovecot%2Fcore.git

submission-login: submission-proxy - Properly encode XCLIENT command arguments.
---

diff --git a/src/submission-login/submission-proxy.c b/src/submission-login/submission-proxy.c
index 6ff5c536b7..ea07000135 100644
--- a/src/submission-login/submission-proxy.c
+++ b/src/submission-login/submission-proxy.c
@@ -71,7 +71,8 @@ proxy_send_xclient(struct submission_client *client, struct ostream *output)
 		str_printfa(str, " PORT=%u", client->common.remote_port);
 	if (str_array_icase_find(client->proxy_xclient, "SESSION")) {
 		str_append(str, " SESSION=");
-		str_append(str, client_get_session_id(&client->common));
+		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);
@@ -80,7 +81,7 @@ proxy_send_xclient(struct submission_client *client, struct ostream *output)
 
 		if (fwd != NULL) {
 			str_append(str, " FORWARD=");
-			str_append_data(str, fwd->data, fwd->used);
+			smtp_xtext_encode(str, fwd->data, fwd->used);
 		}
 	}
 	str_append(str, "\r\n");