Remove hacks for RLM_MODULE_YIELD

diff --git a/src/lib/unlang/interpret.c b/src/lib/unlang/interpret.c
index 81ddbd5ae6c1a26ac4db345282ab12c217b33dbf..f789b29a475c38e0389da7445d2cf54461edf370 100644 (file)
--- a/src/lib/unlang/interpret.c
+++ b/src/lib/unlang/interpret.c
@@ -511,7 +511,6 @@ unlang_frame_action_t frame_eval(request_t *request, unlang_stack_frame_t *frame
                 *      called the interpret.
                 */
                case UNLANG_ACTION_YIELD:
-                       *result = RLM_MODULE_YIELD;     /* Fixup rcode */
                yield:
                        /*
                         *      Detach is magic.  The parent "subrequest" function
@@ -741,7 +740,6 @@ CC_HINT(hot) rlm_rcode_t unlang_interpret(request_t *request)
                        continue;
 
                case UNLANG_FRAME_ACTION_YIELD:
-                       fr_assert(stack->result == RLM_MODULE_YIELD);
                        RDEBUG4("** [%i] %s - interpret yielding", stack->depth, __FUNCTION__);
                        intp->funcs.yield(request, intp->uctx);
                        return stack->result;

diff --git a/src/lib/unlang/tmpl.c b/src/lib/unlang/tmpl.c
index 05dce8fa6b410a52d683f4ed9fd4cec89a632f25..484bf6e90f78078829a8193ed3255709834092d2 100644 (file)
--- a/src/lib/unlang/tmpl.c
+++ b/src/lib/unlang/tmpl.c
@@ -527,7 +527,6 @@ static unlang_action_t unlang_tmpl_exec_wait_resume(rlm_rcode_t *p_result, reque
 
        frame->process = unlang_tmpl_exec_wait_final;
 
-       *p_result = RLM_MODULE_YIELD;
        return UNLANG_ACTION_YIELD;
 }
 

diff --git a/src/modules/rlm_eap/rlm_eap.c b/src/modules/rlm_eap/rlm_eap.c
index 1c07b96624580f5882ee5e33f805a50dde739880..b3b3f32331b310d043ecabbb2c62a2abda080d23 100644 (file)
--- a/src/modules/rlm_eap/rlm_eap.c
+++ b/src/modules/rlm_eap/rlm_eap.c
@@ -405,13 +405,6 @@ static unlang_action_t mod_authenticate_result(rlm_rcode_t *p_result, UNUSED mod
                eap_session->this_round->request->code = FR_EAP_CODE_FAILURE;
                break;
 
-       /*
-        *      Definitely shouldn't get this.
-        */
-       case RLM_MODULE_YIELD:
-               fr_assert(0);
-               break;
-
        default:
                break;
        }

diff --git a/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c b/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c
index d3bde3ceb2f805c5ecaf21a24df4bee8eeb13b85..e2b6e5b1edd49b100f6e43dcb031fd92ddd204ca 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c
+++ b/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c
@@ -188,8 +188,6 @@ static unlang_action_t eap_tls_virtual_server(rlm_rcode_t *p_result, rlm_eap_tls
                RETURN_MODULE_FAIL;
        }
 
-       *p_result = RLM_MODULE_YIELD;
-
        return UNLANG_ACTION_YIELD;
 }
 

diff --git a/src/modules/rlm_python/rlm_python.c b/src/modules/rlm_python/rlm_python.c
index 71013a7baed43408a2a35089ea2a397b37e0d469..5c3dd988a76c93ac7f5e714c467f8de402f45f96 100644 (file)
--- a/src/modules/rlm_python/rlm_python.c
+++ b/src/modules/rlm_python/rlm_python.c
@@ -980,7 +980,6 @@ static int mod_instantiate(void *instance, CONF_SECTION *conf)
                switch (rcode) {
                case RLM_MODULE_FAIL:
                case RLM_MODULE_REJECT:
-               case RLM_MODULE_YIELD:  /* Yield not valid in instantiate */
                error:
                        fr_cond_assert(PyEval_SaveThread() == inst->interpreter);
                        return -1;