From: Stephan Bosch <stephan.bosch@dovecot.fi>
Date: Sat, 1 Sep 2018 13:51:01 +0000 (+0200)
Subject: submission: Split off starting the relay connection in a separate function.
X-Git-Tag: 2.3.9~1325
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dd441ab58d06a5ce7fc247c441a8a4b79280918e;p=thirdparty%2Fdovecot%2Fcore.git

submission: Split off starting the relay connection in a separate function.
---

diff --git a/src/submission/submission-client.c b/src/submission/submission-client.c
index 76d7f6a141..d874459604 100644
--- a/src/submission/submission-client.c
+++ b/src/submission/submission-client.c
@@ -101,6 +101,12 @@ static void client_proxy_ready_cb(const struct smtp_reply *reply,
 	smtp_server_connection_resume(client->conn);
 }
 
+static void client_proxy_start(struct client *client)
+{
+	smtp_client_connection_connect(client->proxy_conn,
+		client_proxy_ready_cb, client);
+}
+
 static void client_proxy_create(struct client *client,
 				const struct submission_settings *set)
 {
@@ -155,8 +161,6 @@ static void client_proxy_create(struct client *client,
 	client->proxy_conn = smtp_client_connection_create(smtp_client,
 		SMTP_PROTOCOL_SMTP, set->submission_relay_host,
 		set->submission_relay_port, ssl_mode, &smtp_set);
-	smtp_client_connection_connect(client->proxy_conn,
-		client_proxy_ready_cb, client);
 }
 
 static void client_init_urlauth(struct client *client)
@@ -225,6 +229,7 @@ struct client *client_create(int fd_in, int fd_out,
 		FALSE, &smtp_set, &smtp_callbacks, client);
 
 	client_proxy_create(client, set);
+	client_proxy_start(client);
 
 	smtp_server_connection_login(client->conn,
 		client->user->username, helo,