doveadm: Use doveadm_get_ssl_settings

diff --git a/src/doveadm/doveadm-fs.c b/src/doveadm/doveadm-fs.c
index 63af5d54086c29a4ebdc7dc9b308e07776e41f4d..67ea8a9686782aa6982b4ab5fde6186018cf45c6 100644 (file)
--- 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 fa83187c0a2c809bf5da4d20341c5df0ec2280df..c1e7bb61b4bc4b6e3fb6a0d949637ddb12763c5b 100644 (file)
--- 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,