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

Fix build failures caused by merge

Browse Source 
A variable was not added that was used and a comparison between signed and
unsigned integers was made.
This commit is contained in:
Markus Mäkelä
2017-11-21 16:54:24 +02:00
parent afcb708e6e
commit 70bf901102
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
server/core/config.cc
View File

@ -1690,6 +1690,7 @@ SSL_LISTENER* make_ssl_structure (CONFIG_CONTEXT *obj, bool require_cert, int *e
ssl_ca_cert = config_get_value(obj->parameters, CN_SSL_CA_CERT); ssl_ca_cert = config_get_value(obj->parameters, CN_SSL_CA_CERT);
ssl_version = config_get_value(obj->parameters, CN_SSL_VERSION); ssl_version = config_get_value(obj->parameters, CN_SSL_VERSION);
ssl_cert_verify_depth = config_get_value(obj->parameters, CN_SSL_CERT_VERIFY_DEPTH); ssl_cert_verify_depth = config_get_value(obj->parameters, CN_SSL_CERT_VERIFY_DEPTH);
const char* ssl_verify_peer_certificate = config_get_value(obj->parameters, CN_SSL_VERIFY_PEER_CERTIFICATE);
new_ssl->ssl_init_done = false; new_ssl->ssl_init_done = false;
new_ssl->ssl_cert_verify_depth = 9; // Default of 9 as per Linux man page new_ssl->ssl_cert_verify_depth = 9; // Default of 9 as per Linux man page
new_ssl->ssl_verify_peer_certificate = true; new_ssl->ssl_verify_peer_certificate = true;

4
server/modules/protocol/MySQL/MySQLClient/mysql_client.cc
View File

@ -426,8 +426,8 @@ int gw_read_client_event(DCB* dcb)
MySQLProtocol *protocol; MySQLProtocol *protocol;
GWBUF *read_buffer = NULL; GWBUF *read_buffer = NULL;
int return_code = 0; int return_code = 0;
int nbytes_read = 0; uint32_t nbytes_read = 0;
int max_bytes = 0; uint32_t max_bytes = 0;
CHK_DCB(dcb); CHK_DCB(dcb);
if (dcb->dcb_role != DCB_ROLE_CLIENT_HANDLER) if (dcb->dcb_role != DCB_ROLE_CLIENT_HANDLER)