From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Tue, 31 Oct 2017 23:03:31 +0000 (+0200)
Subject: login-common: Use client_init_ssl() to initialize all SSL connections
X-Git-Tag: 2.3.0.rc1~521
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9b450c91ee94f0a368e8e9b27fa92487d831b21c;p=thirdparty%2Fdovecot%2Fcore.git

login-common: Use client_init_ssl() to initialize all SSL connections
---

diff --git a/src/login-common/main.c b/src/login-common/main.c
index e69f2608d2..b75fcac8d8 100644
--- a/src/login-common/main.c
+++ b/src/login-common/main.c
@@ -116,38 +116,26 @@ static void
 client_connected_finish(const struct master_service_connection *conn)
 {
 	struct client *client;
-	struct ssl_proxy *proxy;
 	const struct login_settings *set;
 	const struct master_service_ssl_settings *ssl_set;
 	pool_t pool;
-	int fd_ssl;
 	void **other_sets;
 
 	pool = pool_alloconly_create("login client", 8*1024);
 	set = login_settings_read(pool, &conn->local_ip,
 				  &conn->remote_ip, NULL, &ssl_set, &other_sets);
 
-	if (!ssl_connections && !conn->ssl) {
-		client = client_alloc(conn->fd, FALSE, pool, conn,
-				      set, ssl_set);
-		client_init(client, other_sets);
-	} else {
-		fd_ssl = ssl_proxy_alloc(conn->fd, &conn->remote_ip, pool,
-					 set, ssl_set, &proxy);
-		if (fd_ssl == -1) {
+	client = client_alloc(conn->fd, FALSE, pool, conn,
+			      set, ssl_set);
+	if (ssl_connections || conn->ssl) {
+		if (client_init_ssl(client) < 0) {
+			client_unref(&client);
 			net_disconnect(conn->fd);
-			pool_unref(&pool);
 			master_service_client_connection_destroyed(master_service);
 			return;
 		}
-
-		client = client_alloc(fd_ssl, TRUE, pool, conn,
-				      set, ssl_set);
-		client_init(client, other_sets);
-		client->ssl_proxy = proxy;
-		ssl_proxy_set_client(proxy, client);
-		ssl_proxy_start(proxy);
 	}
+	client_init(client, other_sets);
 
 	timeout_remove(&auth_client_to);
 }