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

Fixed log messages not mentioning SHOW DATABASES privilege.

Browse Source
This commit is contained in:
Markus Makela
2015-04-01 10:05:54 +03:00
parent 3b11a945cb
commit 31a43a846e
1 changed files with 9 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
server/core/dbusers.c
View File

@ -89,6 +89,7 @@
#define LOAD_MYSQL_DATABASE_NAMES "SELECT * FROM ( (SELECT COUNT(1) AS ndbs FROM INFORMATION_SCHEMA.SCHEMATA) AS tbl1, (SELECT GRANTEE,PRIVILEGE_TYPE from INFORMATION_SCHEMA.USER_PRIVILEGES WHERE privilege_type='SHOW DATABASES' AND REPLACE(GRANTEE, \'\\'\',\'\')=CURRENT_USER()) AS tbl2)" #define LOAD_MYSQL_DATABASE_NAMES "SELECT * FROM ( (SELECT COUNT(1) AS ndbs FROM INFORMATION_SCHEMA.SCHEMATA) AS tbl1, (SELECT GRANTEE,PRIVILEGE_TYPE from INFORMATION_SCHEMA.USER_PRIVILEGES WHERE privilege_type='SHOW DATABASES' AND REPLACE(GRANTEE, \'\\'\',\'\')=CURRENT_USER()) AS tbl2)"
#define ERROR_NO_SHOW_DATABASES "%s: Unable to load database grant information, MaxScale authentication will proceed without including database permissions. To correct this GRANT SHOW DATABASES ON *.* privilege to the user %s."
/** Defined in log_manager.cc */ /** Defined in log_manager.cc */
extern int lm_enabled_logfiles_bitmask; extern int lm_enabled_logfiles_bitmask;
extern size_t log_ses_count[]; extern size_t log_ses_count[];
@ -380,11 +381,8 @@ addDatabases(SERVICE *service, MYSQL *con)
LOGIF(LE, (skygw_log_write_flush( LOGIF(LE, (skygw_log_write_flush(
LOGFILE_ERROR, LOGFILE_ERROR,
"%s: Unable to load database grant information, MaxScale " ERROR_NO_SHOW_DATABASES,
"authentication will proceed without including database " service->name, service_user)));
"permissions. To correct this GRANT select permission "
"on mysql.db to the user %s.",
service->name, service_user)));
} }
/* free resut set */ /* free resut set */
@ -486,11 +484,8 @@ getDatabases(SERVICE *service, MYSQL *con)
LOGIF(LE, (skygw_log_write_flush( LOGIF(LE, (skygw_log_write_flush(
LOGFILE_ERROR, LOGFILE_ERROR,
"%s: Unable to load database grant information, MaxScale " ERROR_NO_SHOW_DATABASES,
"authentication will proceed without including database " service->name, service_user)));
"permissions. To correct this GRANT select permission "
"on mysql.db to the user %s.",
service->name, service_user)));
} }
/* free resut set */ /* free resut set */
@ -762,11 +757,8 @@ getAllUsers(SERVICE *service, USERS *users)
LOGIF(LE, (skygw_log_write_flush( LOGIF(LE, (skygw_log_write_flush(
LOGFILE_ERROR, LOGFILE_ERROR,
"%s: Unable to load database grant information, MaxScale " ERROR_NO_SHOW_DATABASES,
"authentication will proceed without including database " service->name, service_user)));
"permissions. To correct this GRANT select permission "
"on msql.db to the user %s.",
service->name, service_user)));
/* check for root user select */ /* check for root user select */
if(service->enable_root) { if(service->enable_root) {
@ -1255,11 +1247,8 @@ getUsers(SERVICE *service, USERS *users)
LOGIF(LE, (skygw_log_write_flush( LOGIF(LE, (skygw_log_write_flush(
LOGFILE_ERROR, LOGFILE_ERROR,
"%s: Unable to load database grant information, MaxScale " ERROR_NO_SHOW_DATABASES,
"authentication will proceed without including database " service->name, service_user)));
"permissions. To correct this GRANT select permission "
"on msql.db to the user %s.",
service->name, service_user)));
/* check for root user select */ /* check for root user select */
if(service->enable_root) { if(service->enable_root) {