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

MXS-684: Service permission checks use correct column names

Browse Source 
The MySQL 5.7 `authentication_string` column caused all permission checks
to fail for services.
This commit is contained in:
Markus Makela
2016-04-25 11:07:43 +03:00
parent 53fecdec6b
commit 7f18c579a4
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/core/dbusers.c
View File

@ -2673,7 +2673,13 @@ bool check_service_permissions(SERVICE* service)
return my_errno != ER_ACCESS_DENIED_ERROR; return my_errno != ER_ACCESS_DENIED_ERROR;
} }
if (mysql_query(mysql, "SELECT user, host, password,Select_priv FROM mysql.user limit 1") != 0) char query[MAX_QUERY_STR_LEN];
const char* query_pw = strstr(server->server->server_string, "5.7.") ?
MYSQL57_PASSWORD : MYSQL_PASSWORD;
snprintf(query, sizeof(query), "SELECT user, host, %s, Select_priv FROM mysql.user limit 1", query_pw);
if (mysql_query(mysql, query) != 0)
{ {
if (mysql_errno(mysql) == ER_TABLEACCESS_DENIED_ERROR) if (mysql_errno(mysql) == ER_TABLEACCESS_DENIED_ERROR)
{ {