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

Merge branch '2.1' into develop

Browse Source
This commit is contained in:
Markus Mäkelä
2017-03-22 15:20:21 +02:00
parent 039f6e3487 27d81cda6a
commit 7bd05d4581
107 changed files with 3365 additions and 3638 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
server/modules/authenticator/MySQLAuth/mysql_auth.c
View File

@ -614,8 +614,11 @@ static int mysql_auth_load_users(SERV_LISTENER *port)
return MXS_AUTH_LOADUSERS_FATAL;
}
bool skip_local = false;
if (instance->handle == NULL)
{
skip_local = true;
char path[PATH_MAX];
get_database_path(port, path, sizeof(path));
if (!open_instance_database(path, &instance->handle))
@ -624,7 +627,7 @@ static int mysql_auth_load_users(SERV_LISTENER *port)
}
}
int loaded = replace_mysql_users(port);
int loaded = replace_mysql_users(port, skip_local);
if (loaded < 0)
{
@ -642,7 +645,7 @@ static int mysql_auth_load_users(SERV_LISTENER *port)
}
}
if (loaded == 0)
if (loaded == 0 && !skip_local)
{
MXS_WARNING("[%s]: failed to load any user information. Authentication"
" will probably fail as a result.", service->name);