From: Alan T. DeKok Date: Thu, 14 Dec 2023 15:07:42 +0000 (-0500) Subject: don't reset module on resume. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f15b593055c3dc73ebf78d224d3487078e901870;p=thirdparty%2Ffreeradius-server.git don't reset module on resume. it breaks the debug output --- diff --git a/src/lib/unlang/module.c b/src/lib/unlang/module.c index a082420ec38..6794b567baf 100644 --- a/src/lib/unlang/module.c +++ b/src/lib/unlang/module.c @@ -715,12 +715,8 @@ static unlang_action_t unlang_module_resume(rlm_rcode_t *p_result, request_t *re fr_assert(state->resume != NULL); - /* - * Lock is noop unless instance->mutex is set. - */ - request->module = mc->instance->name; - resume = state->resume; + /* * The module *MUST* explicitly set the resume * function when yielding or pushing children @@ -728,6 +724,9 @@ static unlang_action_t unlang_module_resume(rlm_rcode_t *p_result, request_t *re */ state->resume = NULL; + /* + * Lock is noop unless instance->mutex is set. + */ safe_lock(mc->instance); ua = resume(&state->rcode, MODULE_CTX(mc->instance->dl_inst, state->thread->data, state->env_data, state->rctx), request);