From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Wed, 22 Nov 2017 10:02:11 +0000 (+0200)
Subject: login-proxy: Fix hang in outgoing SSL connections
X-Git-Tag: 2.3.0.rc1~418
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9f1038760ca5ba154366176a7056aad1c7b6c77e;p=thirdparty%2Fdovecot%2Fcore.git

login-proxy: Fix hang in outgoing SSL connections

The handshaking needs to be started explicitly.
---

diff --git a/src/login-common/login-proxy.c b/src/login-common/login-proxy.c
index 0d25844bfd..48c72ef3be 100644
--- a/src/login-common/login-proxy.c
+++ b/src/login-common/login-proxy.c
@@ -717,6 +717,12 @@ int login_proxy_starttls(struct login_proxy *proxy)
 		return -1;
 	}
 	ssl_iostream_context_unref(&ssl_ctx);
+	if (ssl_iostream_handshake(proxy->server_ssl_iostream) < 0) {
+		client_log_err(proxy->client, t_strdup_printf(
+			"proxy: Failed to start SSL handshake to %s:%u: %s",
+			net_ip2addr(&proxy->ip), proxy->port, error));
+		return -1;
+	}
 
 	proxy->server_io = io_add_istream(proxy->server_input,
 					  proxy_prelogin_input, proxy);