From: Stephan Bosch <stephan.bosch@dovecot.fi>
Date: Mon, 3 Dec 2018 17:45:37 +0000 (+0100)
Subject: lib-smtp: client: Copy proxy data from settings using the new smtp_proxy_data_merge... 
X-Git-Tag: 2.3.9~1020
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=858d8f4dc7833a09e6e96e54b2d189d43e059c48;p=thirdparty%2Fdovecot%2Fcore.git

lib-smtp: client: Copy proxy data from settings using the new smtp_proxy_data_merge() functioṅ.
---

diff --git a/src/lib-smtp/smtp-client-connection.c b/src/lib-smtp/smtp-client-connection.c
index 6f87a9187f..1a1becdc5e 100644
--- a/src/lib-smtp/smtp-client-connection.c
+++ b/src/lib-smtp/smtp-client-connection.c
@@ -1884,17 +1884,8 @@ smtp_client_connection_do_create(struct smtp_client *client, const char *name,
 			conn->set.socket_recv_buffer_size = set->socket_recv_buffer_size;
 		conn->set.debug = conn->set.debug || set->debug;
 
-		if (set->proxy_data.source_ip.family != 0) {
-			conn->set.proxy_data.proto = set->proxy_data.proto;
-			conn->set.proxy_data.source_ip = set->proxy_data.source_ip;
-			conn->set.proxy_data.source_port = set->proxy_data.source_port;
-			conn->set.proxy_data.ttl_plus_1 = set->proxy_data.ttl_plus_1;
-			conn->set.proxy_data.timeout_secs = set->proxy_data.timeout_secs;
-			conn->set.proxy_data.helo =
-				p_strdup_empty(pool, set->proxy_data.helo);
-			conn->set.proxy_data.login =
-				p_strdup_empty(pool, set->proxy_data.login);
-		}
+		smtp_proxy_data_merge(conn->pool, &conn->set.proxy_data,
+				      &set->proxy_data);
 		conn->set.peer_trusted = set->peer_trusted;
 	}