doveadm: Use doveadm_get_ssl_settings

dovecot · Jan 23, 2019 · 72b2a3b · 72b2a3b
1 parent af3c215
commit 72b2a3b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git 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
@@ -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,