From: Pieter Lexis Date: Fri, 22 Jul 2016 18:49:39 +0000 (+0200) Subject: pdns_recursor.cc: Move comment to the right place X-Git-Tag: rec-4.0.2~1^2~27 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=54be222b58f7956b1de6ea4a24ff9c31b31e647d;p=thirdparty%2Fpdns.git pdns_recursor.cc: Move comment to the right place --- diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc index a6af98d7fe..4649ca5d10 100644 --- a/pdns/pdns_recursor.cc +++ b/pdns/pdns_recursor.cc @@ -739,9 +739,6 @@ void startDoResolve(void *p) if(!dc->d_mdp.d_header.rd) sr.setCacheOnly(); - - // if there is a RecursorLua active, and it 'took' the query in preResolve, we don't launch beginResolve - dfepol = luaconfsLocal->dfe.getQueryPolicy(dc->d_mdp.d_qname, dc->d_remote); switch(dfepol.d_kind) { @@ -785,6 +782,7 @@ void startDoResolve(void *p) break; } + // if there is a RecursorLua active, and it 'took' the query in preResolve, we don't launch beginResolve if(!t_pdl->get() || !(*t_pdl)->preresolve(dc->d_remote, dc->d_local, dc->d_mdp.d_qname, QType(dc->d_mdp.d_qtype), dc->d_tcp, ret, dc->d_ednsOpts.empty() ? 0 : &dc->d_ednsOpts, dc->d_tag, &appliedPolicy, &dc->d_policyTags, res, &variableAnswer)) { try { res = sr.beginResolve(dc->d_mdp.d_qname, QType(dc->d_mdp.d_qtype), dc->d_mdp.d_qclass, ret);