If the frame is cancelled, don't run next

diff --git a/src/lib/unlang/interpret.c b/src/lib/unlang/interpret.c
index b6874380904b0f8ebaf73be770cd7e8671ffb1a6..737c8cd8924e9cd0060ab49bd184de2d0569f50b 100644 (file)
--- 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.
                         *