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

Fixed possible error in user authentication from multiple sources.

Browse Source
This commit is contained in:
Markus Makela 2015-03-16 11:15:40 +02:00
parent 58b16e1468
commit 06318cf0ea
2 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
server/core/dbusers.c
View File

@ -496,20 +496,7 @@ getAllUsers(SERVICE *service, USERS *users)
{
goto cleanup;
}
/* Select a server with Master bit, if available */
if(service->users_from_all == false)
{
while (server != NULL && !(server->server->status & SERVER_MASTER)) {
server = server->next;
}
}
if(server == NULL)
{
/* If no master is found take the first available server */
server = service->dbref;
}
while(server != NULL)
{
@ -796,18 +783,27 @@ getAllUsers(SERVICE *service, USERS *users)
*/
if (db_grants) {
bool havedb = false;
/* we have dbgrants, store them */
if(row[5]){
strncpy(dbnm,row[5],MYSQL_DATABASE_MAXLEN);
unsigned long *rowlen = mysql_fetch_lengths(result);
memcpy(dbnm,row[5],rowlen[5]);
memset(dbnm + rowlen[5],0,1);
havedb = true;
if(service->strip_db_esc) {
strip_escape_chars(dbnm);
LOGIF(LD, (skygw_log_write(
LOGFILE_DEBUG,
"[%s]: %s -> %s",
service->name,
row[5],
dbnm)));
}
}
else {
*dbnm = 0;
}
rc = add_mysql_users_with_host_ipv4(users, row[0], row[1], password, row[4], dbnm);
skygw_log_write(LOGFILE_DEBUG,"%s: Adding user:%s host:%s anydb:%s db:%s.",service->name,row[0],row[1],row[4],dbnm);
rc = add_mysql_users_with_host_ipv4(users, row[0], row[1], password, row[4],havedb ? dbnm : NULL);
skygw_log_write(LOGFILE_DEBUG,"%s: Adding user:%s host:%s anydb:%s db:%s.",
service->name,row[0],row[1],row[4],
havedb ? dbnm : NULL);
} else {
/* we don't have dbgrants, simply set ANY DB for the user */
rc = add_mysql_users_with_host_ipv4(users, row[0], row[1], password, "Y", NULL);

2
server/core/service.c
View File

@ -131,6 +131,8 @@ SERVICE *service;
}
service->name = strdup(servname);
service->routerModule = strdup(router);
service->users_from_all = false;
if (service->name == NULL || service->routerModule == NULL)
{
if (service->name)