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

Merge branch '2.1' into 2.2

Browse Source
This commit is contained in:
Markus Mäkelä
2017-10-03 14:30:06 +03:00
parent 27ccf0877c 9280f1a5d7
commit bd39284f9c
39 changed files with 685 additions and 417 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
server/modules/authenticator/GSSAPI/GSSAPIAuth/gssapi_auth.c
View File

@ -605,13 +605,21 @@ int gssapi_auth_load_users(SERV_LISTENER *listener)
if (serviceGetUser(listener->service, &user, &pw) && (pw = decrypt_password(pw)))
{
bool no_active_servers = true;
for (SERVER_REF *servers = listener->service->dbref; servers; servers = servers->next)
{
if (!SERVER_REF_IS_ACTIVE(servers) || !SERVER_IS_ACTIVE(servers->server))
{
continue;
}
no_active_servers = false;
MYSQL *mysql = mysql_init(NULL);
if (mxs_mysql_real_connect(mysql, servers->server, user, pw))
{
if (mysql_query(mysql, gssapi_users_query))
if (mxs_mysql_query(mysql, gssapi_users_query))
{
MXS_ERROR("Failed to query server '%s' for GSSAPI users: %s",
servers->server->unique_name, mysql_error(mysql));
@ -649,6 +657,11 @@ int gssapi_auth_load_users(SERV_LISTENER *listener)
}
MXS_FREE(pw);
if (no_active_servers)
{
rval = MXS_AUTH_LOADUSERS_OK;
}
}
return rval;