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

Fix masking and dwfwfilter compilation

Browse Source 
The filters were broken by the merge.
This commit is contained in:
Markus Mäkelä
2019-03-21 18:17:28 +02:00
parent 2ba7e63e7e
commit 0f1bc60431
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/modules/filter/dbfwfilter/dbfwfilter.cc
View File

@ -1528,7 +1528,7 @@ int DbfwSession::routeQuery(GWBUF* buffer)
if (match && m_instance->get_log_bitmask() & FW_LOG_MATCH) if (match && m_instance->get_log_bitmask() & FW_LOG_MATCH)
{ {
MXS_NOTICE("[%s] Rule '%s' for '%s' matched by %s@%s: %s", MXS_NOTICE("[%s] Rule '%s' for '%s' matched by %s@%s: %s",
m_session->service->name, m_session->service->name(),
rname, rname,
suser->name(), suser->name(),
user().c_str(), user().c_str(),
@ -1538,7 +1538,7 @@ int DbfwSession::routeQuery(GWBUF* buffer)
else if (!match && m_instance->get_log_bitmask() & FW_LOG_NO_MATCH) else if (!match && m_instance->get_log_bitmask() & FW_LOG_NO_MATCH)
{ {
MXS_NOTICE("[%s] Query for '%s' by %s@%s was not matched: %s", MXS_NOTICE("[%s] Query for '%s' by %s@%s was not matched: %s",
m_session->service->name, m_session->service->name(),
suser->name(), suser->name(),
user().c_str(), user().c_str(),
remote().c_str(), remote().c_str(),

2
server/modules/filter/masking/maskingfilterconfig.cc
View File

@ -128,5 +128,5 @@ bool MaskingFilterConfig::get_prevent_function_usage(const MXS_CONFIG_PARAMETER*
// static // static
bool MaskingFilterConfig::get_check_user_variables(const MXS_CONFIG_PARAMETER* pParams) bool MaskingFilterConfig::get_check_user_variables(const MXS_CONFIG_PARAMETER* pParams)
{ {
return config_get_bool(pParams, check_user_variables_name); return pParams->get_bool(check_user_variables_name);
} }