From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Tue, 6 Jun 2023 16:41:08 +0000 (-0400)
Subject: Remove NO_RCTX state machine macros, there's always an RCTX now
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b18ed74643b3722e011cd801beec9b6d3b4dd6bb;p=thirdparty%2Ffreeradius-server.git

Remove NO_RCTX state machine macros, there's always an RCTX now
---

diff --git a/src/lib/server/process.h b/src/lib/server/process.h
index 9be07e11388..2459b99c6ea 100644
--- a/src/lib/server/process.h
+++ b/src/lib/server/process.h
@@ -128,8 +128,6 @@ do { \
 #define RECV(_x) static inline unlang_action_t recv_ ## _x(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 #define SEND(_x) static inline unlang_action_t send_ ## _x(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 #define RESUME(_x) static inline unlang_action_t resume_ ## _x(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
-#define SEND_NO_RCTX(_x) static inline unlang_action_t send_ ## _x(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
-#define RESUME_NO_RCTX(_x) static inline unlang_action_t resume_ ## _x(rlm_rcode_t *p_result, module_ctx_t const *mctx, request_t *request)
 #define RESUME_NO_MCTX(_x) static inline unlang_action_t resume_ ## _x(rlm_rcode_t *p_result, UNUSED module_ctx_t const *mctx, request_t *request)
 
 /** Call a named recv function directly
diff --git a/src/process/radius/base.c b/src/process/radius/base.c
index 41b664c61e7..a8a34e64e5c 100644
--- a/src/process/radius/base.c
+++ b/src/process/radius/base.c
@@ -669,7 +669,7 @@ RESUME(auth_type)
 	return state->send(p_result, mctx, request);
 }
 
-RESUME_NO_RCTX(access_accept)
+RESUME(access_accept)
 {
 	fr_pair_t			*vp;
 	process_radius_t const		*inst = talloc_get_type_abort_const(mctx->inst->data, process_radius_t);
@@ -702,7 +702,7 @@ RESUME_NO_RCTX(access_accept)
 	RETURN_MODULE_OK;
 }
 
-RESUME_NO_RCTX(access_reject)
+RESUME(access_reject)
 {
 	fr_pair_t			*vp;
 	process_radius_t const		*inst = talloc_get_type_abort_const(mctx->inst->data, process_radius_t);
diff --git a/src/process/tacacs/base.c b/src/process/tacacs/base.c
index edfcfd6ce7a..3ac1f6f514b 100644
--- a/src/process/tacacs/base.c
+++ b/src/process/tacacs/base.c
@@ -745,7 +745,7 @@ RESUME(auth_type)
 	return state->send(p_result, mctx, request);
 }
 
-RESUME_NO_RCTX(auth_pass)
+RESUME(auth_pass)
 {
 	fr_pair_t			*vp;
 	process_tacacs_t const		*inst = talloc_get_type_abort_const(mctx->inst->data, process_tacacs_t);
@@ -765,7 +765,7 @@ RESUME_NO_RCTX(auth_pass)
 	RETURN_MODULE_OK;
 }
 
-RESUME_NO_RCTX(auth_fail)
+RESUME(auth_fail)
 {
 	fr_pair_t			*vp;
 	process_tacacs_t const		*inst = talloc_get_type_abort_const(mctx->inst->data, process_tacacs_t);
@@ -786,7 +786,7 @@ RESUME_NO_RCTX(auth_fail)
 	RETURN_MODULE_OK;
 }
 
-RESUME_NO_RCTX(auth_restart)
+RESUME(auth_restart)
 {
 	process_tacacs_t const		*inst = talloc_get_type_abort_const(mctx->inst->data, process_tacacs_t);
 
diff --git a/src/process/ttls/base.c b/src/process/ttls/base.c
index 2285fefe524..eeb4a8a65e4 100644
--- a/src/process/ttls/base.c
+++ b/src/process/ttls/base.c
@@ -534,7 +534,7 @@ RESUME(auth_type)
 	return state->send(p_result, mctx, request);
 }
 
-RESUME_NO_RCTX(access_accept)
+RESUME(access_accept)
 {
 	fr_pair_t			*vp;
 	process_ttls_t const		*inst = talloc_get_type_abort_const(mctx->inst->data, process_ttls_t);
@@ -567,7 +567,7 @@ RESUME_NO_RCTX(access_accept)
 	RETURN_MODULE_OK;
 }
 
-RESUME_NO_RCTX(access_reject)
+RESUME(access_reject)
 {
 	fr_pair_t			*vp;
 	process_ttls_t const		*inst = talloc_get_type_abort_const(mctx->inst->data, process_ttls_t);