From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Fri, 7 Apr 2017 12:47:27 +0000 (+0300)
Subject: auth: passdb imap: Use ssl_client_ca_* settings.
X-Git-Tag: 2.3.0.rc1~1771
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=49bf57720f56d8f4fbfd2de41c43cbc6bba8a5c4;p=thirdparty%2Fdovecot%2Fcore.git

auth: passdb imap: Use ssl_client_ca_* settings.

The args = ssl_ca_dir=.. setting still overrides the ssl_client_ca_dir.
---

diff --git a/src/auth/passdb-imap.c b/src/auth/passdb-imap.c
index 78b490985c..3d26a14d60 100644
--- a/src/auth/passdb-imap.c
+++ b/src/auth/passdb-imap.c
@@ -87,6 +87,9 @@ passdb_imap_verify_plain(struct auth_request *auth_request,
 			    DNS_CLIENT_SOCKET_NAME, NULL);
 	set.password = password;
 	set.max_idle_time = IMAPC_DEFAULT_MAX_IDLE_TIME;
+	if (set.ssl_ca_dir == NULL)
+		set.ssl_ca_dir = auth_request->set->ssl_client_ca_dir;
+	set.ssl_ca_file = auth_request->set->ssl_client_ca_file;
 
 	if (module->set_have_vars) {
 		str = t_str_new(128);