From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Tue, 31 Oct 2017 23:06:05 +0000 (+0200)
Subject: login-common: client_alloc() - remove unnecessary ssl parameter
X-Git-Tag: 2.3.0.rc1~520
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=be6e55ff7c81afdc7ed9b47c6021a4f7827e4407;p=thirdparty%2Fdovecot%2Fcore.git

login-common: client_alloc() - remove unnecessary ssl parameter
---

diff --git a/src/login-common/client-common.c b/src/login-common/client-common.c
index 350565dff9..f57b264fb8 100644
--- a/src/login-common/client-common.c
+++ b/src/login-common/client-common.c
@@ -152,7 +152,7 @@ static bool client_is_trusted(struct client *client)
 }
 
 struct client *
-client_alloc(int fd, bool ssl, pool_t pool,
+client_alloc(int fd, pool_t pool,
 	     const struct master_service_connection *conn,
 	     const struct login_settings *set,
 	     const struct master_service_ssl_settings *ssl_set)
@@ -178,8 +178,6 @@ client_alloc(int fd, bool ssl, pool_t pool,
 	p_array_init(&client->module_contexts, client->pool, 5);
 
 	client->fd = fd;
-	client->tls = ssl;
-
 	client->local_ip = conn->local_ip;
 	client->local_port = conn->local_port;
 	client->ip = conn->remote_ip;
@@ -196,7 +194,7 @@ client_alloc(int fd, bool ssl, pool_t pool,
 		client->local_name = conn->proxy.hostname;
 		client->client_cert_common_name = conn->proxy.cert_common_name;
 	} else {
-		client->secured = ssl || client->trusted ||
+		client->secured = client->trusted ||
 			net_ip_compare(&conn->real_remote_ip, &conn->real_local_ip);
 	}
 	client->proxy_ttl = LOGIN_PROXY_TTL;
diff --git a/src/login-common/client-common.h b/src/login-common/client-common.h
index cc1127fad9..e49fca13d2 100644
--- a/src/login-common/client-common.h
+++ b/src/login-common/client-common.h
@@ -238,7 +238,7 @@ void login_client_hooks_add(struct module *module,
 void login_client_hooks_remove(const struct login_client_hooks *hooks);
 
 struct client *
-client_alloc(int fd, bool ssl, pool_t pool,
+client_alloc(int fd, pool_t pool,
 	     const struct master_service_connection *conn,
 	     const struct login_settings *set,
 	     const struct master_service_ssl_settings *ssl_set);
diff --git a/src/login-common/main.c b/src/login-common/main.c
index b75fcac8d8..8f1d79e91f 100644
--- a/src/login-common/main.c
+++ b/src/login-common/main.c
@@ -125,8 +125,7 @@ client_connected_finish(const struct master_service_connection *conn)
 	set = login_settings_read(pool, &conn->local_ip,
 				  &conn->remote_ip, NULL, &ssl_set, &other_sets);
 
-	client = client_alloc(conn->fd, FALSE, pool, conn,
-			      set, ssl_set);
+	client = client_alloc(conn->fd, pool, conn, set, ssl_set);
 	if (ssl_connections || conn->ssl) {
 		if (client_init_ssl(client) < 0) {
 			client_unref(&client);