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

Merge branch '2.3' into develop

Browse Source
This commit is contained in:
Markus Mäkelä
2019-05-22 10:02:27 +03:00
parent af92fef510 365efb9d3a
commit e545e2ac5c
2 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
server/modules/authenticator/MariaDBAuth/dbusers.cc
View File

@ -816,23 +816,28 @@ static bool check_default_table_permissions(MYSQL* mysql,
"Database name will be ignored in authentication. ");
// Check whether the current user has the SHOW DATABASES privilege
if (mxs_mysql_query(mysql,
"SELECT show_db_priv FROM mysql.user "
"WHERE CONCAT(user, '@', host) = CURRENT_USER()") == 0)
if (mxs_mysql_query(mysql, "SHOW GRANTS") == 0)
{
MYSQL_RES* res = mysql_use_result(mysql);
if (res)
if (MYSQL_RES* res = mysql_use_result(mysql))
{
MYSQL_ROW row = mysql_fetch_row(res);
bool found = false;
if (row && strcasecmp(row[0], "Y") != 0)
for (MYSQL_ROW row = mysql_fetch_row(res); row; row = mysql_fetch_row(res))
{
if (strcasestr(row[0], "SHOW DATABASES"))
{
found = true;
break;
}
}
if (!found)
{
MXS_WARNING("[%s] User '%s' is missing the SHOW DATABASES privilege. "
"This means that MaxScale cannot see all databases and authentication can fail.",
service->name(),
user);
}
mysql_free_result(res);
}
}