From 72b2a3b2bf21272080a5f31c50692baafc6e0f72 Mon Sep 17 00:00:00 2001 From: Aki Tuomi Date: Thu, 15 Nov 2018 14:47:32 +0200 Subject: [PATCH] doveadm: Use doveadm_get_ssl_settings --- src/doveadm/doveadm-fs.c | 5 +---- src/doveadm/server-connection.c | 5 +++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/doveadm/doveadm-fs.c b/src/doveadm/doveadm-fs.c index fdfef8fab4..41948d01b5 100644 --- a/src/doveadm/doveadm-fs.c +++ b/src/doveadm/doveadm-fs.c @@ -43,11 +43,8 @@ cmd_fs_init(int *argc, char **argv[], int own_arg_count, doveadm_command_t *cmd) fs_cmd_help(cmd); } - i_zero(&ssl_set); - ssl_set.ca_dir = doveadm_settings->ssl_client_ca_dir; - ssl_set.ca_file = doveadm_settings->ssl_client_ca_file; + doveadm_get_ssl_settings(&ssl_set, pool_datastack_create()); ssl_set.verbose = doveadm_debug; - i_zero(&fs_set); fs_set.ssl_client_set = &ssl_set; fs_set.temp_dir = "/tmp"; diff --git a/src/doveadm/server-connection.c b/src/doveadm/server-connection.c index 75975599ed..8f1242dac6 100644 --- a/src/doveadm/server-connection.c +++ b/src/doveadm/server-connection.c @@ -509,8 +509,9 @@ static int server_connection_init_ssl(struct server_connection *conn) if (conn->server->ssl_ctx == NULL) return 0; - i_zero(&ssl_set); - ssl_set.verbose_invalid_cert = TRUE; + doveadm_get_ssl_settings(&ssl_set, conn->pool); + if (ssl_set.allow_invalid_cert) + ssl_set.verbose_invalid_cert = TRUE; if (io_stream_create_ssl_client(conn->server->ssl_ctx, conn->server->hostname, &ssl_set,