hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MXS-2483: Take SSLContext into use

Browse Source 
SSLContext is now used everywhere except the binlogrouter which still
allocates the contexts itself. Fixing the binlogrouter's misuse of
internal structures is a rather large undertaking and for this reason the
SSLContext will be taken into use there in a separate commit.
This commit is contained in:
Markus Mäkelä
2019-05-17 16:35:22 +03:00
parent 73796be9d6
commit 82add11e86
8 changed files with 24 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/modules/routing/binlogrouter/blr_file.cc
View File

@ -3453,16 +3453,6 @@ int blr_file_write_master_config(ROUTER_INSTANCE* router, char* error)
mxb_assert(current.user == router->user);
mxb_assert(current.password == router->password);
if (router->ssl_enabled)
{
mxb_assert(current.ssl_enabled);
mxb_assert(current.ssl_ca == router->service->dbref->server->server_ssl->ssl_ca_cert);
mxb_assert(current.ssl_cert == router->service->dbref->server->server_ssl->ssl_cert);
mxb_assert(current.ssl_key == router->service->dbref->server->server_ssl->ssl_key);
}
mxb_assert(!router->ssl_version || (current.ssl_version == router->ssl_version));
mxb_assert(current.heartbeat_period == (int)router->heartbeat);
mxb_assert(current.connect_retry == router->retry_interval);
#endif