Mercurial > dovecot > core-2.2

changeset 22019:d968b963d3aa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
passdb-imap: Add ssl_ca_file setting Allow setting SSL trust roots from a file
author Aki Tuomi <aki.tuomi@dovecot.fi>
date Mon, 08 May 2017 12:24:21 +0300
parents c635141adb77
children f08ffc29981c
files src/auth/passdb-imap.c
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/auth/passdb-imap.c	Fri Apr 28 20:28:23 2017 +0300
+++ b/src/auth/passdb-imap.c	Mon May 08 12:24:21 2017 +0300
@@ -98,7 +98,8 @@
 	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 (set.ssl_ca_file == NULL)
+		set.ssl_ca_file = auth_request->set->ssl_client_ca_file;
 
 	if (module->set_have_vars) {
 		str = t_str_new(128);
@@ -155,6 +156,8 @@
 			module->set.username = value;
 		else if (strcmp(key, "ssl_ca_dir") == 0)
 			module->set.ssl_ca_dir = value;
+		else if (strcmp(key, "ssl_ca_file") == 0)
+			module->set.ssl_ca_file = value;
 		else if (strcmp(key, "rawlog_dir") == 0)
 			module->set.rawlog_dir = value;
 		else if (strcmp(key, "ssl") == 0) {