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

MXS-2196: Take Listener into use

Browse Source
This commit is contained in:
Markus Mäkelä
2018-11-30 11:43:33 +02:00
parent 330719c8f9
commit a10b6c2e89
16 changed files with 93 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/modules/authenticator/MySQLAuth/dbusers.cc
View File

@ -1123,7 +1123,7 @@ int get_users_from_server(MYSQL* con, SERVER_REF* server_ref, SERVICE* service,
service->enable_root,
category);
MYSQL_AUTH* instance = (MYSQL_AUTH*)listener->auth_instance;
MYSQL_AUTH* instance = (MYSQL_AUTH*)listener->auth_instance();
sqlite3* handle = get_handle(instance);
int users = 0;
@ -1182,7 +1182,7 @@ static int get_users(Listener* listener, bool skip_local)
{
const char* service_user = NULL;
const char* service_passwd = NULL;
SERVICE* service = listener->service;
SERVICE* service = listener->service();
serviceGetUser(service, &service_user, &service_passwd);
@ -1194,7 +1194,7 @@ static int get_users(Listener* listener, bool skip_local)
}
/** Delete the old users */
MYSQL_AUTH* instance = (MYSQL_AUTH*)listener->auth_instance;
MYSQL_AUTH* instance = (MYSQL_AUTH*)listener->auth_instance();
sqlite3* handle = get_handle(instance);
delete_mysql_users(handle);