From: Stephan Bosch <stephan.bosch@open-xchange.com>
Date: Mon, 4 Oct 2021 00:02:21 +0000 (+0200)
Subject: lib-smtp: smtp-client - Use smtp_proxy_data_merge() to copy proxy data in smtp_client... 
X-Git-Tag: 2.3.18~245
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2d4587d13a9fc09cc42f2802fea15f66f110d3a0;p=thirdparty%2Fdovecot%2Fcore.git

lib-smtp: smtp-client - Use smtp_proxy_data_merge() to copy proxy data in smtp_client_init().
---

diff --git a/src/lib-smtp/smtp-client.c b/src/lib-smtp/smtp-client.c
index 41723be4a0..be62cbd09d 100644
--- a/src/lib-smtp/smtp-client.c
+++ b/src/lib-smtp/smtp-client.c
@@ -79,12 +79,7 @@ struct smtp_client *smtp_client_init(const struct smtp_client_settings *set)
 	client->set.socket_recv_buffer_size = set->socket_recv_buffer_size;
 	client->set.debug = set->debug;
 
-	client->set.proxy_data.source_ip = set->proxy_data.source_ip;
-	client->set.proxy_data.source_port = set->proxy_data.source_port;
-	client->set.proxy_data.ttl_plus_1 = set->proxy_data.ttl_plus_1;
-	client->set.proxy_data.timeout_secs = set->proxy_data.timeout_secs;
-	client->set.proxy_data.helo = p_strdup_empty(pool, set->proxy_data.helo);
-	client->set.proxy_data.login = p_strdup_empty(pool, set->proxy_data.login);
+	smtp_proxy_data_merge(pool, &client->set.proxy_data, &set->proxy_data);
 
 	client->conn_list = smtp_client_connection_list_init();