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

MXS-1842 Compile all authenticators as C++

Browse Source 
Minimal changes, only what is needed to compile.
This commit is contained in:
Johan Wikman
2018-05-02 15:41:03 +03:00
parent aa1c956aa7
commit eba6c0c596
23 changed files with 68 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/modules/authenticator/GSSAPI/GSSAPIAuth/CMakeLists.txt
View File

@ -1,4 +1,4 @@
add_library(gssapiauth SHARED gssapi_auth.c ../gssapi_auth_common.c)
add_library(gssapiauth SHARED gssapi_auth.cc ../gssapi_auth_common.cc)
target_link_libraries(gssapiauth maxscale-common ${GSSAPI_LIBS} ${SQLITE_LIBRARIES} mysqlcommon)
set_target_properties(gssapiauth PROPERTIES VERSION "1.0.0")
install_module(gssapiauth core)

14
server/modules/authenticator/GSSAPI/GSSAPIAuth/gssapi_auth.c → server/modules/authenticator/GSSAPI/GSSAPIAuth/gssapi_auth.cc
View File

@ -106,7 +106,7 @@ typedef struct gssapi_instance
*/
void* gssapi_auth_init(char **options)
{
GSSAPI_INSTANCE *instance = MXS_MALLOC(sizeof(GSSAPI_INSTANCE));
GSSAPI_INSTANCE *instance = static_cast<GSSAPI_INSTANCE*>(MXS_MALLOC(sizeof(GSSAPI_INSTANCE)));
if (instance)
{
@ -162,7 +162,7 @@ void* gssapi_auth_init(char **options)
void* gssapi_auth_alloc(void *instance)
{
gssapi_auth_t* rval = MXS_MALLOC(sizeof(gssapi_auth_t));
gssapi_auth_t* rval = static_cast<gssapi_auth_t*>(MXS_MALLOC(sizeof(gssapi_auth_t)));
if (rval)
{
@ -250,7 +250,7 @@ bool store_client_token(DCB *dcb, GWBUF *buffer)
size_t plen = gw_mysql_get_byte3(hdr);
MYSQL_session *ses = (MYSQL_session*)dcb->data;
if ((ses->auth_token = MXS_MALLOC(plen)))
if ((ses->auth_token = static_cast<uint8_t*>(MXS_MALLOC(plen))))
{
gwbuf_copy_data(buffer, MYSQL_HEADER_LEN, plen, ses->auth_token);
ses->auth_token_len = plen;
@ -384,7 +384,7 @@ static bool validate_gssapi_token(char* principal, uint8_t* token, size_t len, c
return false;
}
char *princ_name = MXS_MALLOC(client_name.length + 1);
char *princ_name = static_cast<char*>(MXS_MALLOC(client_name.length + 1));
if (!princ_name)
{
@ -515,7 +515,7 @@ void gssapi_auth_free_data(DCB *dcb)
{
if (dcb->data)
{
MYSQL_session *ses = dcb->data;
MYSQL_session *ses = static_cast<MYSQL_session*>(dcb->data);
MXS_FREE(ses->auth_token);
MXS_FREE(ses);
dcb->data = NULL;
@ -667,6 +667,8 @@ int gssapi_auth_load_users(SERV_LISTENER *listener)
return rval;
}
extern "C"
{
/**
* Module handle entry point
*/
@ -705,3 +707,5 @@ MXS_MODULE* MXS_CREATE_MODULE()
return &info;
}
}

2
server/modules/authenticator/GSSAPI/GSSAPIBackendAuth/CMakeLists.txt
View File

@ -1,4 +1,4 @@
add_library(gssapibackendauth SHARED gssapi_backend_auth.c ../gssapi_auth_common.c)
add_library(gssapibackendauth SHARED gssapi_backend_auth.cc ../gssapi_auth_common.cc)
target_link_libraries(gssapibackendauth maxscale-common ${GSSAPI_LIBS} mysqlcommon)
set_target_properties(gssapibackendauth PROPERTIES VERSION "1.0.0")
install_module(gssapibackendauth core)

8
server/modules/authenticator/GSSAPI/GSSAPIBackendAuth/gssapi_backend_auth.c → server/modules/authenticator/GSSAPI/GSSAPIBackendAuth/gssapi_backend_auth.cc
View File

@ -28,7 +28,7 @@
void* gssapi_backend_auth_alloc(void *instance)
{
gssapi_auth_t* rval = MXS_MALLOC(sizeof(gssapi_auth_t));
gssapi_auth_t* rval = static_cast<gssapi_auth_t*>(MXS_MALLOC(sizeof(gssapi_auth_t)));
if (rval)
{
@ -176,7 +176,7 @@ bool extract_principal_name(DCB *dcb, GWBUF *buffer)
if (buflen > 0)
{
uint8_t *principal = MXS_MALLOC(buflen + 1);
uint8_t *principal = static_cast<uint8_t*>(MXS_MALLOC(buflen + 1));
if (principal)
{
@ -264,6 +264,8 @@ static int gssapi_backend_auth_authenticate(DCB *dcb)
return rval;
}
extern "C"
{
/**
* Module handle entry point
*/
@ -302,3 +304,5 @@ MXS_MODULE* MXS_CREATE_MODULE()
return &info;
}
}

0
server/modules/authenticator/GSSAPI/gssapi_auth_common.c → server/modules/authenticator/GSSAPI/gssapi_auth_common.cc
View File