From: Alan T. DeKok <aland@freeradius.org>
Date: Tue, 27 Apr 2021 11:15:54 +0000 (-0400)
Subject: cache request->module, as per the other uses
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c47213af1fbadfd465db42420bdb7979d5445a71;p=thirdparty%2Ffreeradius-server.git

cache request->module, as per the other uses
---

diff --git a/src/lib/unlang/module.c b/src/lib/unlang/module.c
index d02af3a394d..8fe00efd3cc 100644
--- a/src/lib/unlang/module.c
+++ b/src/lib/unlang/module.c
@@ -580,15 +580,19 @@ static void unlang_module_signal(request_t *request, unlang_stack_frame_t *frame
 {
 	unlang_frame_state_module_t	*state = talloc_get_type_abort(frame->state, unlang_frame_state_module_t);
 	unlang_module_t			*mc = unlang_generic_to_module(frame->instruction);
+	char const			*caller;
 
 	if (!state->signal) return;
 
+	caller = request->module;
 	request->module = mc->instance->name;
 	state->signal(&(module_ctx_t){
 			.instance = mc->instance->dl_inst->data,
 			.thread = state->thread->data
 		      },
 		      request, state->rctx, action);
+	request->module = caller;
+
 	/*
 	 *	One fewer caller for this module.  Since this module
 	 *	has been cancelled, decrement the active callers and