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

Merge branch 'develop' into plainrouter

Browse Source
This commit is contained in:
Markus Makela
2015-03-31 12:56:29 +03:00
parent b11d66148a be968cfad2
commit a4fff83727
18 changed files with 779 additions and 309 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -530,6 +530,12 @@ static int gw_mysql_do_authentication(DCB *dcb, GWBUF *queue) {
if (auth_ret == 0) {
dcb->user = strdup(client_data->user);
}
else
{
skygw_log_write(LOGFILE_ERROR,
"%s: login attempt for user '%s', authentication failed.",
dcb->service->name, username);
}
/* let's free the auth_token now */
if (auth_token) {
@ -900,7 +906,7 @@ int gw_read_client_event(
dcb,
ERRACT_NEW_CONNECTION,
&succp);
free(errbuf);
gwbuf_free(errbuf);
/**
* If there are not enough backends close
* session

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

@ -1530,14 +1530,20 @@ int gw_find_mysql_user_password_sha1(char *username, uint8_t *gateway_password,
* user@% not found.
*/
LOGIF(LD,
(skygw_log_write_flush(
LOGFILE_DEBUG,
"%lu [MySQL Client Auth], user [%s@%s] not existent",
pthread_self(),
key.user,
dcb->remote)));
break;
LOGIF(LD,
(skygw_log_write_flush(
LOGFILE_DEBUG,
"%lu [MySQL Client Auth], user [%s@%s] not existent",
pthread_self(),
key.user,
dcb->remote)));
LOGIF(LT,skygw_log_write_flush(
LOGFILE_ERROR,
"Authentication Failed: user [%s@%s] not found.",
key.user,
dcb->remote));
break;
}
break;