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

Fix to bug # 565, http://bugs.mariadb.com/show_bug.cgi?id=565

Browse Source 
Client flags are now copied to each backend and used in their connections.

log_manager.cc: fixed string allocation where one byte was missing.
mysql_client.c: fixed string allocation where one byte was missing.
This commit is contained in:
VilhoRaatikka
2014-10-08 22:27:28 +03:00
parent 76e85dfb11
commit 29e53e150a
4 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
log_manager/log_manager.cc
View File

@ -2073,7 +2073,7 @@ static bool logfile_init(
char* c; char* c;
pid_t pid = getpid(); pid_t pid = getpid();
int len = strlen(shm_pathname_prefix)+ int len = strlen(shm_pathname_prefix)+
get_decimal_len((size_t)pid); get_decimal_len((size_t)pid) + 1;
c = (char *)calloc(len, sizeof(char)); c = (char *)calloc(len, sizeof(char));

4
server/modules/protocol/mysql_backend.c
View File

@ -880,6 +880,10 @@ static int gw_create_backend_connection(
goto return_fd; goto return_fd;
} }
/** Copy client flags to backend protocol */
protocol->client_capabilities =
((MySQLProtocol *)(backend_dcb->session->client->protocol))->client_capabilities;
/*< if succeed, fd > 0, -1 otherwise */ /*< if succeed, fd > 0, -1 otherwise */
rv = gw_do_connect_to_backend(server->name, server->port, &fd); rv = gw_do_connect_to_backend(server->name, server->port, &fd);
/*< Assign protocol with backend_dcb */ /*< Assign protocol with backend_dcb */

4
server/modules/protocol/mysql_client.c
View File

@ -520,7 +520,7 @@ static char* get_username_from_auth(
if (ptr == NULL) if (ptr == NULL)
{ {
if ((rval = (char *)malloc(MYSQL_USER_MAXLEN)) == NULL) if ((rval = (char *)malloc(MYSQL_USER_MAXLEN+1)) == NULL)
{ {
goto retblock; goto retblock;
} }
@ -529,7 +529,7 @@ static char* get_username_from_auth(
{ {
rval = ptr; rval = ptr;
} }
strncpy(rval, first_letter, MYSQL_USER_MAXLEN); snprintf(rval, MYSQL_USER_MAXLEN+1, "%s", first_letter);
retblock: retblock:

11
server/modules/protocol/mysql_common.c
View File

@ -572,9 +572,8 @@ int gw_send_authentication_to_backend(
memset(&final_capabilities, '\0', sizeof(final_capabilities)); memset(&final_capabilities, '\0', sizeof(final_capabilities));
final_capabilities = gw_mysql_get_byte4((uint8_t *)&server_capabilities); final_capabilities = gw_mysql_get_byte4((uint8_t *)&server_capabilities);
/** Copy client's flags to backend */
final_capabilities |= GW_MYSQL_CAPABILITIES_PROTOCOL_41; final_capabilities |= conn->client_capabilities;;
final_capabilities |= GW_MYSQL_CAPABILITIES_CLIENT;
if (compress) { if (compress) {
final_capabilities |= GW_MYSQL_CAPABILITIES_COMPRESS; final_capabilities |= GW_MYSQL_CAPABILITIES_COMPRESS;
@ -1362,8 +1361,10 @@ int gw_find_mysql_user_password_sha1(char *username, uint8_t *gateway_password,
LOGIF(LE, LOGIF(LE,
(skygw_log_write_flush( (skygw_log_write_flush(
LOGFILE_ERROR, LOGFILE_ERROR,
"%lu [MySQL Client Auth], user [%s@%s] not found, please try with 'localhost_match_wildcard_host=1' in service definition", "Error : user %s@%s not found, try set "
pthread_self(), "'localhost_match_wildcard_host=1' in "
"service definition of the configuration "
"file.",
key.user, key.user,
dcb->remote))); dcb->remote)));