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

Merge branch '2.2' into develop

Browse Source
This commit is contained in:
Markus Mäkelä
2018-07-06 14:56:19 +03:00
parent f2b8487577 cb05199bac
commit bfd3d2975d
8 changed files with 68 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
server/modules/authenticator/MySQLAuth/mysql_auth.cc
View File

@ -576,6 +576,19 @@ static bool add_service_user(SERV_LISTENER *port)
return rval;
}
static bool service_has_servers(SERVICE* service)
{
for (SERVER_REF* s = service->dbref; s; s = s->next)
{
if (s->active)
{
return true;
}
}
return false;
}
/**
* @brief Load MySQL authentication users
*
@ -632,9 +645,12 @@ static int mysql_auth_load_users(SERV_LISTENER *port)
if (injected)
{
MXS_NOTICE("[%s] No users were loaded but 'inject_service_user' is enabled. "
"Enabling service credentials for authentication until "
"database users have been successfully loaded.", service->name);
if (service_has_servers(service))
{
MXS_NOTICE("[%s] No users were loaded but 'inject_service_user' is enabled. "
"Enabling service credentials for authentication until "
"database users have been successfully loaded.", service->name);
}
}
else if (loaded == 0 && !first_load)
{