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 9be07e1138890b0bf05a436ec393f0d73fa246fa..2459b99c6ea80e3e30a8a92159a521edc6840561 100644 (file)
--- 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 41b664c61e7f62fa38fdd572ca4f41aa93af6c80..a8a34e64e5ca29f6f998649b89bf8e1b16add662 100644 (file)
--- 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 edfcfd6ce7ab9176cdaf0ca6b186831084c8df63..3ac1f6f514b3d53c7f4b5665f642affc6301937a 100644 (file)
--- 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 2285fefe524a8e9086f7ba70a6c9be81b8265e28..eeb4a8a65e40250046a016bc636b712d97399075 100644 (file)
--- 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);