From 9ba06f7c07c192610b9fa5add41d92b8ac74d005 Mon Sep 17 00:00:00 2001 From: Johan Wikman Date: Mon, 9 Jan 2017 09:37:11 +0200 Subject: [PATCH] Fix merge issues --- server/modules/filter/masking/maskingfilter.cc | 6 ++---- server/modules/filter/masking/maskingfiltersession.cc | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/server/modules/filter/masking/maskingfilter.cc b/server/modules/filter/masking/maskingfilter.cc index d9aed6a3f..f772d4fe4 100644 --- a/server/modules/filter/masking/maskingfilter.cc +++ b/server/modules/filter/masking/maskingfilter.cc @@ -172,14 +172,12 @@ void MaskingFilter::reload(DCB* pOut) } // static -bool MaskingFilter::process_params(char **pzOptions, CONFIG_PARAMETER *ppParams, Config& config) +bool MaskingFilter::process_params(char **pzOptions, CONFIG_PARAMETER *pParams, Config& config) { bool error = false; - for (int i = 0; ppParams[i]; ++i) + for (const CONFIG_PARAMETER* pParam = pParams; pParam; pParam = pParam->next) { - const FILTER_PARAMETER *pParam = ppParams[i]; - if (strcmp(pParam->name, "rules_file") == 0) { string rules_file; diff --git a/server/modules/filter/masking/maskingfiltersession.cc b/server/modules/filter/masking/maskingfiltersession.cc index 6e7b32b6b..7b9e57c69 100644 --- a/server/modules/filter/masking/maskingfiltersession.cc +++ b/server/modules/filter/masking/maskingfiltersession.cc @@ -123,7 +123,7 @@ void MaskingFilterSession::handle_field(GWBUF* pPacket) ComQueryResponse::ColumnDef column_def(pPacket); - const char *zUser = session_getUser(m_pSession); + const char *zUser = session_get_user(m_pSession); const char *zHost = session_get_remote(m_pSession); if (!zUser)