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/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;
}
}