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

diff --git a/src/lib-smtp/smtp-client.c b/src/lib-smtp/smtp-client.c
index 41723be4a0b538c81969e6a07bcbcadd6f43bd08..be62cbd09de27715d83bb57604636cd48e680123 100644 (file)
--- 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();