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/HTTPAuth/CMakeLists.txt
View File

@ -1,4 +1,4 @@
add_library(httpauth SHARED http_auth.c)
add_library(httpauth SHARED http_auth.cc)
target_link_libraries(httpauth maxscale-common)
set_target_properties(httpauth PROPERTIES VERSION "1.0.0")
install_module(httpauth core)

5
server/modules/authenticator/HTTPAuth/http_auth.c → server/modules/authenticator/HTTPAuth/http_auth.cc
View File

@ -47,6 +47,8 @@ typedef struct http_auth
char* pw;
} HTTP_AUTH;
extern "C"
{
/**
* The module entry point routine. It is this routine that
* must populate the structure that is referred to as the
@ -91,6 +93,7 @@ MXS_MODULE* MXS_CREATE_MODULE()
return &info;
}
/*lint +e14 */
}
/**
* @brief Authentication of a user/password combination.
@ -153,7 +156,7 @@ http_auth_set_protocol_data(DCB *dcb, GWBUF *buf)
if (pw_start)
{
*pw_start++ = '\0';
HTTP_AUTH *ses = MXS_MALLOC(sizeof(*ses));
HTTP_AUTH *ses = static_cast<HTTP_AUTH*>(MXS_MALLOC(sizeof(*ses)));
char* user = MXS_STRDUP(outbuf);
char* pw = MXS_STRDUP(pw_start);