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

Fixed multi-character wildcard database grants not working with schemarouter.

Browse Source
This commit is contained in:
Markus Makela
2015-05-26 23:08:29 +03:00
parent 4cbcc4ecb6
commit 06bece82a8
1 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
server/core/dbusers.c
View File

@ -974,19 +974,27 @@ getAllUsers(SERVICE *service, USERS *users)
} }
} }
if(service->optimize_wildcard && havedb && wildcard_db_grant(dbnm)) if(havedb && wildcard_db_grant(dbnm))
{ {
rc = add_wildcard_users(users, row[0], row[1], password, row[4], dbnm, service->resources); if(service->optimize_wildcard)
skygw_log_write(LOGFILE_DEBUG|LOGFILE_TRACE,"%s: Converted '%s' to %d individual database grants.",service->name,dbnm,rc); {
rc = add_wildcard_users(users, row[0], row[1], password, row[4], dbnm, service->resources);
skygw_log_write(LOGFILE_DEBUG|LOGFILE_TRACE,"%s: Converted '%s' to %d individual database grants.",service->name,dbnm,rc);
}
else
{
/** Use ANYDB for wildcard grants */
rc = add_mysql_users_with_host_ipv4(users, row[0], row[1], password, "Y", NULL);
}
} }
else else
{ {
rc = add_mysql_users_with_host_ipv4(users, row[0], row[1], password, row[4], havedb ? dbnm : NULL); 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.", LOGIF(LD,(skygw_log_write(LOGFILE_DEBUG,"%s: Adding user:%s host:%s anydb:%s db:%s.",
service->name,row[0],row[1],row[4], service->name,row[0],row[1],row[4],
havedb ? dbnm : NULL); havedb ? dbnm : NULL)));
} else { } else {
/* we don't have dbgrants, simply set ANY DB for the user */ /* 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); rc = add_mysql_users_with_host_ipv4(users, row[0], row[1], password, "Y", NULL);
@ -1483,10 +1491,18 @@ getUsers(SERVICE *service, USERS *users)
} }
} }
if(service->optimize_wildcard && havedb && wildcard_db_grant(row[5])) if(havedb && wildcard_db_grant(row[5]))
{ {
rc = add_wildcard_users(users, row[0], row[1], password, row[4], dbnm, service->resources); if(service->optimize_wildcard)
skygw_log_write(LOGFILE_DEBUG|LOGFILE_TRACE,"%s: Converted '%s' to %d individual database grants.",service->name,row[5],rc); {
rc = add_wildcard_users(users, row[0], row[1], password, row[4], dbnm, service->resources);
skygw_log_write(LOGFILE_DEBUG|LOGFILE_TRACE,"%s: Converted '%s' to %d individual database grants.",service->name,row[5],rc);
}
else
{
/** Use ANYDB for wildcard grants */
rc = add_mysql_users_with_host_ipv4(users, row[0], row[1], password, "Y", NULL);
}
} }
else else
{ {