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

MXS-2196: Rename SERV_LISTENER to Listener

Browse Source
This commit is contained in:
Markus Mäkelä
2018-11-29 17:39:48 +02:00
parent 8c847ec10d
commit 39f668ff3c
16 changed files with 70 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/modules/authenticator/CDCPlainAuth/cdc_plain_auth.cc
View File

@ -52,8 +52,8 @@ static bool cdc_auth_is_client_ssl_capable(DCB* dcb);
static int cdc_auth_authenticate(DCB* dcb);
static void cdc_auth_free_client_data(DCB* dcb);
static int cdc_set_service_user(SERV_LISTENER* listener);
static int cdc_replace_users(SERV_LISTENER* listener);
static int cdc_set_service_user(Listener* listener);
static int cdc_replace_users(Listener* listener);
static int cdc_auth_check(DCB* dcb,
CDC_protocol* protocol,
@ -437,7 +437,7 @@ static void cdc_auth_free_client_data(DCB* dcb)
* @param service The current service
* @return 0 on success, 1 on failure
*/
static int cdc_set_service_user(SERV_LISTENER* listener)
static int cdc_set_service_user(Listener* listener)
{
SERVICE* service = listener->service;
char* dpwd = NULL;
@ -538,7 +538,7 @@ static int cdc_read_users(USERS* users, char* usersfile)
*
* @param service The current service
*/
int cdc_replace_users(SERV_LISTENER* listener)
int cdc_replace_users(Listener* listener)
{
int rc = MXS_AUTH_LOADUSERS_ERROR;
USERS* newusers = users_alloc();

2
server/modules/authenticator/GSSAPI/GSSAPIAuth/gssapi_auth.cc
View File

@ -622,7 +622,7 @@ static void add_gssapi_user(sqlite3* handle,
* @param listener Listener definition
* @return MXS_AUTH_LOADUSERS_OK on success, MXS_AUTH_LOADUSERS_ERROR on error
*/
int gssapi_auth_load_users(SERV_LISTENER* listener)
int gssapi_auth_load_users(Listener* listener)
{
const char* user;
const char* password;

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

@ -141,7 +141,7 @@ enum server_category_t
SERVER_CLUSTRIX
};
static int get_users(SERV_LISTENER* listener, bool skip_local);
static int get_users(Listener* listener, bool skip_local);
static MYSQL* gw_mysql_init(void);
static int gw_mysql_set_timeouts(MYSQL* handle);
static char* mysql_format_user_entry(void* data);
@ -226,7 +226,7 @@ static char* get_users_query(const char* server_version, int version, bool inclu
return rval;
}
int replace_mysql_users(SERV_LISTENER* listener, bool skip_local)
int replace_mysql_users(Listener* listener, bool skip_local)
{
int i = get_users(listener, skip_local);
return i;
@ -1096,7 +1096,7 @@ bool query_and_process_users(const char* query,
return rval;
}
int get_users_from_server(MYSQL* con, SERVER_REF* server_ref, SERVICE* service, SERV_LISTENER* listener)
int get_users_from_server(MYSQL* con, SERVER_REF* server_ref, SERVICE* service, Listener* listener)
{
if (server_ref->server->version_string[0] == 0)
{
@ -1178,7 +1178,7 @@ int get_users_from_server(MYSQL* con, SERVER_REF* server_ref, SERVICE* service,
* @param users The users table into which to load the users
* @return -1 on any error or the number of users inserted
*/
static int get_users(SERV_LISTENER* listener, bool skip_local)
static int get_users(Listener* listener, bool skip_local)
{
const char* service_user = NULL;
const char* service_passwd = NULL;

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

@ -42,7 +42,7 @@ static bool mysql_auth_set_protocol_data(DCB* dcb, GWBUF* buf);
static bool mysql_auth_is_client_ssl_capable(DCB* dcb);
static int mysql_auth_authenticate(DCB* dcb);
static void mysql_auth_free_client_data(DCB* dcb);
static int mysql_auth_load_users(SERV_LISTENER* port);
static int mysql_auth_load_users(Listener* port);
static void* mysql_auth_create(void* instance);
static void mysql_auth_destroy(void* data);
@ -58,8 +58,8 @@ static bool mysql_auth_set_client_data(MYSQL_session* client_data,
MySQLProtocol* protocol,
GWBUF* buffer);
void mysql_auth_diagnostic(DCB* dcb, SERV_LISTENER* port);
json_t* mysql_auth_diagnostic_json(const SERV_LISTENER* port);
void mysql_auth_diagnostic(DCB* dcb, Listener* port);
json_t* mysql_auth_diagnostic_json(const Listener* port);
int mysql_auth_reauthenticate(DCB* dcb,
const char* user,
@ -552,7 +552,7 @@ static void mysql_auth_free_client_data(DCB* dcb)
* @param port Service listener
* @return True on success, false on error
*/
static bool add_service_user(SERV_LISTENER* port)
static bool add_service_user(Listener* port)
{
const char* user = NULL;
const char* password = NULL;
@ -607,7 +607,7 @@ static bool service_has_servers(SERVICE* service)
* @return MXS_AUTH_LOADUSERS_OK on success, MXS_AUTH_LOADUSERS_ERROR and
* MXS_AUTH_LOADUSERS_FATAL on fatal error
*/
static int mysql_auth_load_users(SERV_LISTENER* port)
static int mysql_auth_load_users(Listener* port)
{
int rc = MXS_AUTH_LOADUSERS_OK;
SERVICE* service = port->listener->service;
@ -721,7 +721,7 @@ int diag_cb(void* data, int columns, char** row, char** field_names)
return 0;
}
void mysql_auth_diagnostic(DCB* dcb, SERV_LISTENER* port)
void mysql_auth_diagnostic(DCB* dcb, Listener* port)
{
MYSQL_AUTH* instance = (MYSQL_AUTH*)port->auth_instance;
sqlite3* handle = get_handle(instance);
@ -750,7 +750,7 @@ int diag_cb_json(void* data, int columns, char** row, char** field_names)
return 0;
}
json_t* mysql_auth_diagnostic_json(const SERV_LISTENER* port)
json_t* mysql_auth_diagnostic_json(const Listener* port)
{
json_t* rval = json_array();

2
server/modules/authenticator/MySQLAuth/mysql_auth.hh
View File

@ -187,7 +187,7 @@ bool dbusers_save(sqlite3* src, const char* filename);
*
* @return -1 on any error or the number of users inserted (0 means no users at all)
*/
int replace_mysql_users(SERV_LISTENER* listener, bool skip_local);
int replace_mysql_users(Listener* listener, bool skip_local);
/**
* @brief Verify the user has access to the database

6
server/modules/authenticator/PAM/PAMAuth/pam_auth.cc
View File

@ -134,19 +134,19 @@ static void pam_auth_free_data(DCB* dcb)
*
* @return MXS_AUTH_LOADUSERS_OK on success, MXS_AUTH_LOADUSERS_ERROR on error
*/
static int pam_auth_load_users(SERV_LISTENER* listener)
static int pam_auth_load_users(Listener* listener)
{
PamInstance* inst = static_cast<PamInstance*>(listener->auth_instance);
return inst->load_users(listener->service);
}
static void pam_auth_diagnostic(DCB* dcb, SERV_LISTENER* listener)
static void pam_auth_diagnostic(DCB* dcb, Listener* listener)
{
PamInstance* inst = static_cast<PamInstance*>(listener->auth_instance);
inst->diagnostic(dcb);
}
static json_t* pam_auth_diagnostic_json(const SERV_LISTENER* listener)
static json_t* pam_auth_diagnostic_json(const Listener* listener)
{
PamInstance* inst = static_cast<PamInstance*>(listener->auth_instance);
return inst->diagnostic_json();