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

Fix mqfilter build failure

Browse Source 
It called an internal session function for no real reason.
This commit is contained in:
Markus Mäkelä
2017-01-20 09:09:56 +02:00
parent 5a2a69b7be
commit ffc68a688f
1 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
server/modules/filter/mqfilter/mqfilter.c
View File

@ -974,41 +974,39 @@ routeQuery(MXS_FILTER *instance, MXS_FILTER_SESSION *session, GWBUF *queue)
if (my_instance->trgtype & TRG_SOURCE && my_instance->src_trg) if (my_instance->trgtype & TRG_SOURCE && my_instance->src_trg)
{ {
if (session_isvalid(my_session->session))
{
sessusr = session_get_user(my_session->session);
sesshost = session_get_remote(my_session->session);
/**Username was configured*/ sessusr = session_get_user(my_session->session);
if (my_instance->src_trg->usize > 0) sesshost = session_get_remote(my_session->session);
/**Username was configured*/
if (my_instance->src_trg->usize > 0)
{
for (i = 0; i < my_instance->src_trg->usize; i++)
{ {
for (i = 0; i < my_instance->src_trg->usize; i++) if (strcmp(my_instance->src_trg->user[i], sessusr) == 0)
{ {
if (strcmp(my_instance->src_trg->user[i], sessusr) == 0) MXS_INFO("Trigger is TRG_SOURCE: user: %s = %s",
{ my_instance->src_trg->user[i], sessusr);
MXS_INFO("Trigger is TRG_SOURCE: user: %s = %s", src_ok = true;
my_instance->src_trg->user[i], sessusr); break;
src_ok = true;
break;
}
} }
} }
}
/**If username was not matched, try to match hostname*/ /**If username was not matched, try to match hostname*/
if (!src_ok && my_instance->src_trg->hsize > 0) if (!src_ok && my_instance->src_trg->hsize > 0)
{
for (i = 0; i < my_instance->src_trg->hsize; i++)
{ {
for (i = 0; i < my_instance->src_trg->hsize; i++) if (strcmp(my_instance->src_trg->host[i], sesshost) == 0)
{ {
MXS_INFO("Trigger is TRG_SOURCE: host: %s = %s",
if (strcmp(my_instance->src_trg->host[i], sesshost) == 0) my_instance->src_trg->host[i], sesshost);
{ src_ok = true;
MXS_INFO("Trigger is TRG_SOURCE: host: %s = %s", break;
my_instance->src_trg->host[i], sesshost);
src_ok = true;
break;
}
} }
} }
} }