]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
auth: passdb imap: Use ssl_client_ca_* settings.
authorTimo Sirainen <timo.sirainen@dovecot.fi>
Fri, 7 Apr 2017 12:47:27 +0000 (15:47 +0300)
committerTimo Sirainen <timo.sirainen@dovecot.fi>
Fri, 7 Apr 2017 13:23:03 +0000 (16:23 +0300)
The args = ssl_ca_dir=.. setting still overrides the ssl_client_ca_dir.

src/auth/passdb-imap.c

index 4fdd174ee02ea005da538d4cc31312b43c634c58..d39b838d37a938bc055ad853943696d033c7376c 100644 (file)
@@ -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);