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

Merge branch 'develop' into 1.2.1-binlog_router_trx

Browse Source
This commit is contained in:
MassimilianoPinto
2015-08-28 16:42:15 +02:00
parent 197cd9f263 45227c8875
commit 55248ec60e
3 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/core/config.c
View File

@ -898,7 +898,7 @@ process_config_context(CONFIG_CONTEXT *context)
s = strtok_r(NULL, ",", &lasts); s = strtok_r(NULL, ",", &lasts);
} }
} }
else if (servers == NULL && !isInternalService(router)) else if (servers == NULL && !isInternalService(router) && strcmp(router,"binlogrouter"))
{ {
LOGIF(LE, (skygw_log_write_flush( LOGIF(LE, (skygw_log_write_flush(
LOGFILE_ERROR, LOGFILE_ERROR,

20
server/core/dbusers.c
View File

@ -2406,15 +2406,21 @@ bool check_service_permissions(SERVICE* service)
if(mysql_real_connect(mysql,server->server->name,user,dpasswd,NULL,server->server->port,NULL,0) == NULL) if(mysql_real_connect(mysql,server->server->name,user,dpasswd,NULL,server->server->port,NULL,0) == NULL)
{ {
int my_errno = mysql_errno(mysql);
skygw_log_write(LE,"%s: Error: Failed to connect to server %s(%s:%d) when" skygw_log_write(LE,"%s: Error: Failed to connect to server %s(%s:%d) when"
" checking authentication user credentials and permissions.", " checking authentication user credentials and permissions: %d %s",
service->name, service->name,
server->server->unique_name, server->server->unique_name,
server->server->name, server->server->name,
server->server->port); server->server->port,
my_errno,
mysql_error(mysql));
mysql_close(mysql); mysql_close(mysql);
free(dpasswd); free(dpasswd);
return false;
/** We don't know enough about user permissions */
return my_errno != ER_ACCESS_DENIED_ERROR;
} }
if(mysql_query(mysql,"SELECT user, host, password,Select_priv FROM mysql.user limit 1") != 0) if(mysql_query(mysql,"SELECT user, host, password,Select_priv FROM mysql.user limit 1") != 0)
@ -2424,6 +2430,7 @@ bool check_service_permissions(SERVICE* service)
skygw_log_write(LE,"%s: Error: User '%s' is missing SELECT privileges" skygw_log_write(LE,"%s: Error: User '%s' is missing SELECT privileges"
" on mysql.user table. MySQL error message: %s", " on mysql.user table. MySQL error message: %s",
service->name,user,mysql_error(mysql)); service->name,user,mysql_error(mysql));
rval = false;
} }
else else
{ {
@ -2431,7 +2438,6 @@ bool check_service_permissions(SERVICE* service)
" MySQL error message: %s", " MySQL error message: %s",
service->name,mysql_error(mysql)); service->name,mysql_error(mysql));
} }
rval = false;
} }
else else
{ {
@ -2442,9 +2448,8 @@ bool check_service_permissions(SERVICE* service)
service->name,mysql_error(mysql)); service->name,mysql_error(mysql));
mysql_close(mysql); mysql_close(mysql);
free(dpasswd); free(dpasswd);
return false; return true;
} }
mysql_free_result(res); mysql_free_result(res);
} }
if(mysql_query(mysql,"SELECT user, host, db FROM mysql.db limit 1") != 0) if(mysql_query(mysql,"SELECT user, host, db FROM mysql.db limit 1") != 0)
@ -2453,13 +2458,13 @@ bool check_service_permissions(SERVICE* service)
{ {
skygw_log_write(LE,"%s: Error: User '%s' is missing SELECT privileges on mysql.db table. MySQL error message: %s", skygw_log_write(LE,"%s: Error: User '%s' is missing SELECT privileges on mysql.db table. MySQL error message: %s",
service->name,user,mysql_error(mysql)); service->name,user,mysql_error(mysql));
rval = false;
} }
else else
{ {
skygw_log_write(LE,"%s: Error: Failed to query from mysql.db table. MySQL error message: %s", skygw_log_write(LE,"%s: Error: Failed to query from mysql.db table. MySQL error message: %s",
service->name,mysql_error(mysql)); service->name,mysql_error(mysql));
} }
rval = false;
} }
else else
{ {
@ -2467,7 +2472,6 @@ bool check_service_permissions(SERVICE* service)
{ {
skygw_log_write(LE,"%s: Error: Result retrieval failed when checking for permissions to the mysql.db table: %s", skygw_log_write(LE,"%s: Error: Result retrieval failed when checking for permissions to the mysql.db table: %s",
service->name,mysql_error(mysql)); service->name,mysql_error(mysql));
rval = false;
} }
else else
{ {

8
server/core/service.c
View File

@ -235,11 +235,11 @@ GWPROTOCOL *funcs;
{ {
LOGIF(LE, (skygw_log_write_flush( LOGIF(LE, (skygw_log_write_flush(
LOGFILE_ERROR, LOGFILE_ERROR,
"Error : Unable to load users from %s:%d for " "Error : Unable to load users for "
"service %s.", "service %s listening at %s:%d.",
service->name,
(port->address == NULL ? "0.0.0.0" : port->address), (port->address == NULL ? "0.0.0.0" : port->address),
port->port, port->port)));
service->name)));
{ {
/* Try loading authentication data from file cache */ /* Try loading authentication data from file cache */