From 2d4587d13a9fc09cc42f2802fea15f66f110d3a0 Mon Sep 17 00:00:00 2001 From: Stephan Bosch Date: Mon, 4 Oct 2021 02:02:21 +0200 Subject: [PATCH] lib-smtp: smtp-client - Use smtp_proxy_data_merge() to copy proxy data in smtp_client_init(). --- src/lib-smtp/smtp-client.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) 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(); -- 2.47.3