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

Fixed wildcard grants not being added to the users table.

Browse Source
This commit is contained in:
Markus Makela
2015-06-27 09:47:06 +03:00
parent 4759df9f87
commit 88940c0097
1 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
server/core/dbusers.c
View File

@ -974,18 +974,10 @@ getAllUsers(SERVICE *service, USERS *users)
} }
} }
if(havedb && wildcard_db_grant(dbnm)) if(havedb && wildcard_db_grant(dbnm) && service->optimize_wildcard)
{ {
if(service->optimize_wildcard) 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);
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
{ {
@ -1041,8 +1033,8 @@ getAllUsers(SERVICE *service, USERS *users)
} else if(rc == -1) { } else if(rc == -1) {
/** Duplicate user*/ /** Duplicate user*/
LOGIF(LE,(skygw_log_write(LT|LE, LOGIF(LT,(skygw_log_write(LT,
"Warning: Duplicate MySQL user found for service [%s]: %s@%s%s%s", "Duplicate MySQL user found for service [%s]: %s@%s%s%s",
service->name, service->name,
row[0],row[1],havedb?" for database: ":"", row[0],row[1],havedb?" for database: ":"",
havedb ?dbnm:""))); havedb ?dbnm:"")));