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

Merge branch '2.2' into 2.3

Browse Source
This commit is contained in:
Johan Wikman
2018-11-28 11:27:44 +02:00
parent c92e485b3b 590e489be0
commit cf66cc6968
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/Release-Notes/MaxScale-2.2.17-Release-Notes.md
View File

@ -1,4 +1,4 @@
# MariaDB MaxScale 2.2.17 Release Notes # MariaDB MaxScale 2.2.17 Release Notes -- 2018-11-28
Release 2.2.17 is a GA release. Release 2.2.17 is a GA release.

9
server/core/utils.cc
View File

@ -1064,8 +1064,6 @@ int open_network_socket(enum mxs_socket_type type,
memcpy(addr, ai->ai_addr, ai->ai_addrlen); memcpy(addr, ai->ai_addr, ai->ai_addrlen);
set_port(addr, port); set_port(addr, port);
freeaddrinfo(ai);
if ((type == MXS_SOCKET_NETWORK && !configure_network_socket(so, addr->ss_family)) if ((type == MXS_SOCKET_NETWORK && !configure_network_socket(so, addr->ss_family))
|| (type == MXS_SOCKET_LISTENER && !configure_listener_socket(so))) || (type == MXS_SOCKET_LISTENER && !configure_listener_socket(so)))
{ {
@ -1088,12 +1086,15 @@ int open_network_socket(enum mxs_socket_type type,
if (config->local_address) if (config->local_address)
{ {
freeaddrinfo(ai);
ai = NULL;
if ((rc = getaddrinfo(config->local_address, NULL, &hint, &ai)) == 0) if ((rc = getaddrinfo(config->local_address, NULL, &hint, &ai)) == 0)
{ {
struct sockaddr_storage local_address = {}; struct sockaddr_storage local_address = {};
memcpy(&local_address, ai->ai_addr, ai->ai_addrlen); memcpy(&local_address, ai->ai_addr, ai->ai_addrlen);
freeaddrinfo(ai);
if (bind(so, (struct sockaddr*)&local_address, sizeof(local_address)) == 0) if (bind(so, (struct sockaddr*)&local_address, sizeof(local_address)) == 0)
{ {
@ -1117,6 +1118,8 @@ int open_network_socket(enum mxs_socket_type type,
} }
} }
} }
freeaddrinfo(ai);
} }
return so; return so;

2
server/modules/authenticator/MySQLAuth/dbusers.cc
View File

@ -226,7 +226,7 @@ static bool check_password(const char* output,
/** Next, extract the SHA1 of the real password by XOR'ing it with /** Next, extract the SHA1 of the real password by XOR'ing it with
* the output of the previous calculation */ * the output of the previous calculation */
uint8_t step2[SHA_DIGEST_LENGTH]; uint8_t step2[SHA_DIGEST_LENGTH] = {};
gw_str_xor(step2, token, step1, token_len); gw_str_xor(step2, token, step1, token_len);
/** The phase 2 scramble needs to be copied to the shared data structure as it /** The phase 2 scramble needs to be copied to the shared data structure as it