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

Added missing strip_db_esc to dbusers.c

Browse Source
This commit is contained in:
Markus Makela
2015-05-14 13:43:23 +03:00
parent 7d3c8673ec
commit 1edf7a32cc
1 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
server/core/dbusers.c
View File

@ -1118,6 +1118,7 @@ getUsers(SERVICE *service, USERS *users)
MYSQL_DATABASE_MAXLEN; MYSQL_DATABASE_MAXLEN;
int dbnames = 0; int dbnames = 0;
int db_grants = 0; int db_grants = 0;
char dbnm[MYSQL_DATABASE_MAXLEN+1];
if (serviceGetUser(service, &service_user, &service_passwd) == 0) if (serviceGetUser(service, &service_user, &service_passwd) == 0)
{ {
@ -1464,16 +1465,32 @@ getUsers(SERVICE *service, USERS *users)
*/ */
if (db_grants) { if (db_grants) {
bool havedb = false;
/* we have dbgrants, store them */ /* we have dbgrants, store them */
if(row[5]){
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)));
}
}
if(service->optimize_wildcard && wildcard_db_grant(row[5])) if(service->optimize_wildcard && havedb && wildcard_db_grant(row[5]))
{ {
rc = add_wildcard_users(users, row[0], row[1], password, row[4], row[5], service->resources); 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); skygw_log_write(LOGFILE_DEBUG|LOGFILE_TRACE,"%s: Converted '%s' to %d individual database grants.",service->name,row[5],rc);
} }
else else
{ {
rc = add_mysql_users_with_host_ipv4(users, row[0], row[1], password, row[4], row[5]); rc = add_mysql_users_with_host_ipv4(users, row[0], row[1], password, row[4], havedb ? dbnm : NULL);
} }
} else { } else {