From: Stephan Bosch <stephan.bosch@dovecot.fi>
Date: Mon, 3 Dec 2018 17:45:40 +0000 (+0100)
Subject: submission: relay backend: Provide data for the HELO and PROTO XCLIENT fields to... 
X-Git-Tag: 2.3.5~31
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0d883b2cc6a0d0cecc8909f71719f5b772ffad76;p=thirdparty%2Fdovecot%2Fcore.git

submission: relay backend: Provide data for the HELO and PROTO XCLIENT fields to the relay connection.
---

diff --git a/src/submission/submission-backend-relay.c b/src/submission/submission-backend-relay.c
index 2ac74cdb6d..f569bf6f11 100644
--- a/src/submission/submission-backend-relay.c
+++ b/src/submission/submission-backend-relay.c
@@ -1045,9 +1045,15 @@ submission_backend_relay_create(
 	}
 
 	if (set->trusted) {
+		struct smtp_server_helo_data *helo_data =
+			smtp_server_connection_get_helo_data(client->conn);
+
 		backend->trusted = TRUE;
 		smtp_set.peer_trusted = TRUE;
 
+		smtp_set.proxy_data.helo = helo_data->domain;
+		smtp_set.proxy_data.proto = SMTP_PROXY_PROTOCOL_ESMTP;
+
 		if (user->conn.remote_ip != NULL) {
 			smtp_set.proxy_data.source_ip =
 				*user->conn.remote_ip;