From: Stephan Bosch <stephan.bosch@dovecot.fi>
Date: Wed, 28 Feb 2018 17:58:42 +0000 (+0100)
Subject: login-common: Use client SSL certificate and key settings from lib-master.
X-Git-Tag: 2.3.9~2136
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=29320452d52095838d4481cc6e93eef079cece89;p=thirdparty%2Fdovecot%2Fcore.git

login-common: Use client SSL certificate and key settings from lib-master.
---

diff --git a/src/login-common/login-proxy.c b/src/login-common/login-proxy.c
index ead4c05444..645943258a 100644
--- a/src/login-common/login-proxy.c
+++ b/src/login-common/login-proxy.c
@@ -696,11 +696,6 @@ int login_proxy_starttls(struct login_proxy *proxy)
 	   unexpected hangs when login process handles multiple clients. */
 	ssl_set.ca_file = ssl_set.ca_dir = NULL;
 
-	if (proxy->client->set->ssl_client_cert[0] != '\0')
-		ssl_set.cert.cert = proxy->client->set->ssl_client_cert;
-	if (proxy->client->set->ssl_client_key[0] != '\0')
-		ssl_set.cert.key = proxy->client->set->ssl_client_key;
-
 	io_remove(&proxy->server_io);
 	if (ssl_iostream_client_context_cache_get(&ssl_set, &ssl_ctx, &error) < 0) {
 		client_log_err(proxy->client, t_strdup_printf(
diff --git a/src/login-common/login-settings.c b/src/login-common/login-settings.c
index b6d669aae4..8741e42a81 100644
--- a/src/login-common/login-settings.c
+++ b/src/login-common/login-settings.c
@@ -32,8 +32,6 @@ static const struct setting_define login_setting_defines[] = {
 	DEF(SET_TIME, login_proxy_max_disconnect_delay),
 	DEF(SET_STR, director_username_hash),
 
-	DEF(SET_STR, ssl_client_cert),
-	DEF(SET_STR, ssl_client_key),
 	DEF(SET_BOOL, auth_ssl_require_client_cert),
 	DEF(SET_BOOL, auth_ssl_username_from_cert),
 
@@ -60,8 +58,6 @@ static const struct login_settings login_default_settings = {
 	.login_proxy_max_disconnect_delay = 0,
 	.director_username_hash = "%u",
 
-	.ssl_client_cert = "",
-	.ssl_client_key = "",
 	.auth_ssl_require_client_cert = FALSE,
 	.auth_ssl_username_from_cert = FALSE,
 
diff --git a/src/login-common/login-settings.h b/src/login-common/login-settings.h
index 8381d2ecc8..55639447bd 100644
--- a/src/login-common/login-settings.h
+++ b/src/login-common/login-settings.h
@@ -15,8 +15,6 @@ struct login_settings {
 	unsigned int login_proxy_max_disconnect_delay;
 	const char *director_username_hash;
 
-	const char *ssl_client_cert;
-	const char *ssl_client_key;
 	bool auth_ssl_require_client_cert;
 	bool auth_ssl_username_from_cert;