From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Wed, 24 Mar 2021 22:17:03 +0000 (+0000)
Subject: Remove hacks for RLM_MODULE_YIELD
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c448acb8b1a755ecfcb51abf3511eb0de04aba16;p=thirdparty%2Ffreeradius-server.git

Remove hacks for RLM_MODULE_YIELD
---

diff --git a/src/lib/unlang/interpret.c b/src/lib/unlang/interpret.c
index 81ddbd5ae6c..f789b29a475 100644
--- 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 05dce8fa6b4..484bf6e90f7 100644
--- 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 1c07b966245..b3b3f32331b 100644
--- 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 d3bde3ceb2f..e2b6e5b1edd 100644
--- 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 71013a7baed..5c3dd988a76 100644
--- 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;