From: Nick Porter <nick@portercomputing.co.uk>
Date: Wed, 18 Jun 2025 10:33:47 +0000 (+0100)
Subject: If the frame is cancelled, don't run next
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d61537f50dc05f3c45c03cb85dd3e44204e5e17d;p=thirdparty%2Ffreeradius-server.git

If the frame is cancelled, don't run next
---

diff --git a/src/lib/unlang/interpret.c b/src/lib/unlang/interpret.c
index b6874380904..737c8cd8924 100644
--- a/src/lib/unlang/interpret.c
+++ b/src/lib/unlang/interpret.c
@@ -1019,7 +1019,7 @@ CC_HINT(hot) rlm_rcode_t unlang_interpret(request_t *request, bool running)
 			 *	the result is being consumed by a module.
 			 */
 			if (private_result) {
-				fa = UNLANG_FRAME_ACTION_NEXT;
+				fa = is_unwinding(frame) ? UNLANG_FRAME_ACTION_POP : UNLANG_FRAME_ACTION_NEXT;
 			/*
 			 *	Merge lower frame into higher frame.
 			 *