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.2.29~20
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b0a8ad13516483ad2a27f302dbb6978a50477939;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 4fdd174ee0..d39b838d37 100644
--- a/src/auth/passdb-imap.c
+++ b/src/auth/passdb-imap.c
@@ -86,6 +86,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);