From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Sun, 18 May 2025 00:05:10 +0000 (-0600)
Subject: Remove RETURN_MODULE_TRANSPARENT
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ccc34a4eaaa994a185ef42587c5a4bad2282921;p=thirdparty%2Ffreeradius-server.git

Remove RETURN_MODULE_TRANSPARENT
---

diff --git a/src/lib/server/rcode.h b/src/lib/server/rcode.h
index 0a71eb1445b..e78e14d5d76 100644
--- a/src/lib/server/rcode.h
+++ b/src/lib/server/rcode.h
@@ -77,14 +77,6 @@ typedef enum {
 #define RETURN_UNLANG_TIMEOUT		do { p_result->rcode= RLM_MODULE_TIMEOUT; return UNLANG_ACTION_CALCULATE_RESULT; } while (0)
 #define RETURN_UNLANG_RCODE(_rcode)	do { p_result->rcode = (_rcode); return UNLANG_ACTION_CALCULATE_RESULT; } while (0)
 
-/** Don't modify the current rcode
- */
-#define RETURN_MODULE_TRANSPARENT	do { \
-						rlm_rcode_t _rcode = *p_result; \
-						*p_result = _rcode; \
-						return UNLANG_ACTION_CALCULATE_RESULT; \
-					} while (0)
-
 extern fr_table_num_sorted_t const rcode_table[];
 extern size_t rcode_table_len;
 
diff --git a/src/process/radius/base.c b/src/process/radius/base.c
index 224a2f078b5..c93cd2f61de 100644
--- a/src/process/radius/base.c
+++ b/src/process/radius/base.c
@@ -540,7 +540,7 @@ RESUME(auth_type)
 	return state->send(p_result, mctx, request);
 }
 
-RESUME(access_accept)
+RESUME_FLAG(access_accept,UNUSED,)
 {
 	fr_pair_t			*vp;
 	process_radius_t const		*inst = talloc_get_type_abort_const(mctx->mi->data, process_radius_t);
@@ -564,10 +564,10 @@ RESUME(access_accept)
 
 	fr_state_discard(inst->auth.state_tree, request);
 	radius_request_pairs_to_reply(request, mctx->rctx);
-	RETURN_MODULE_TRANSPARENT;
+	return UNLANG_ACTION_CALCULATE_RESULT;
 }
 
-RESUME(access_reject)
+RESUME_FLAG(access_reject,UNUSED,)
 {
 	process_radius_t const		*inst = talloc_get_type_abort_const(mctx->mi->data, process_radius_t);
 
@@ -575,7 +575,7 @@ RESUME(access_reject)
 
 	fr_state_discard(inst->auth.state_tree, request);
 	radius_request_pairs_to_reply(request, mctx->rctx);
-	RETURN_MODULE_TRANSPARENT;
+	return UNLANG_ACTION_CALCULATE_RESULT;
 }
 
 RESUME(access_challenge)
@@ -596,7 +596,7 @@ RESUME(access_challenge)
 
 	fr_assert(request->reply->code == FR_RADIUS_CODE_ACCESS_CHALLENGE);
 	radius_request_pairs_to_reply(request, mctx->rctx);
-	RETURN_MODULE_TRANSPARENT;
+	return UNLANG_ACTION_CALCULATE_RESULT;
 }
 
 /** A wrapper around recv generic which stores fields from the request
diff --git a/src/process/tacacs/base.c b/src/process/tacacs/base.c
index c704216606b..9be1c5b98cc 100644
--- a/src/process/tacacs/base.c
+++ b/src/process/tacacs/base.c
@@ -636,7 +636,7 @@ RESUME(auth_type)
 	return state->send(p_result, mctx, request);
 }
 
-RESUME(auth_pass)
+RESUME_FLAG(auth_pass, UNUSED,)
 {
 	process_tacacs_t const		*inst = talloc_get_type_abort_const(mctx->mi->data, process_tacacs_t);
 
@@ -645,10 +645,10 @@ RESUME(auth_pass)
 	// @todo - worry about user identity existing?
 
 	fr_state_discard(inst->auth.state_tree, request);
-	RETURN_MODULE_TRANSPARENT;
+	return UNLANG_ACTION_CALCULATE_RESULT;
 }
 
-RESUME(auth_fail)
+RESUME_FLAG(auth_fail, UNUSED,)
 {
 	process_tacacs_t const		*inst = talloc_get_type_abort_const(mctx->mi->data, process_tacacs_t);
 
@@ -658,17 +658,17 @@ RESUME(auth_fail)
 	// and also for FAIL
 
 	fr_state_discard(inst->auth.state_tree, request);
-	RETURN_MODULE_TRANSPARENT;
+	return UNLANG_ACTION_CALCULATE_RESULT;
 }
 
-RESUME(auth_restart)
+RESUME_FLAG(auth_restart, UNUSED,)
 {
 	process_tacacs_t const		*inst = talloc_get_type_abort_const(mctx->mi->data, process_tacacs_t);
 
 	PROCESS_TRACE;
 
 	fr_state_discard(inst->auth.state_tree, request);
-	RETURN_MODULE_TRANSPARENT;
+	return UNLANG_ACTION_CALCULATE_RESULT;
 }
 
 RESUME(auth_get)
@@ -757,7 +757,7 @@ send_reply:
 		return CALL_SEND_TYPE(FR_TACACS_CODE_AUTH_ERROR);
 	}
 
-	RETURN_MODULE_TRANSPARENT;
+	return UNLANG_ACTION_CALCULATE_RESULT;
 }
 
 RECV(auth_cont)
diff --git a/src/process/ttls/base.c b/src/process/ttls/base.c
index 20f9553f98f..b480aed9600 100644
--- a/src/process/ttls/base.c
+++ b/src/process/ttls/base.c
@@ -22,6 +22,7 @@
  * @copyright 2021 The FreeRADIUS server project.
  * @copyright 2021 Network RADIUS SAS (legal@networkradius.com)
  */
+#include "lib/unlang/action.h"
 #include <freeradius-devel/protocol/freeradius/freeradius.internal.h>
 
 #include <freeradius-devel/radius/radius.h>
@@ -385,7 +386,7 @@ RESUME(auth_type)
 	return state->send(p_result, mctx, request);
 }
 
-RESUME(access_accept)
+RESUME_FLAG(access_accept, UNUSED,)
 {
 	fr_pair_t			*vp;
 	process_ttls_t const		*inst = talloc_get_type_abort_const(mctx->mi->data, process_ttls_t);
@@ -408,17 +409,17 @@ RESUME(access_accept)
 	}
 
 	fr_state_discard(inst->auth.state_tree, request);
-	RETURN_MODULE_TRANSPARENT;
+	return UNLANG_ACTION_CALCULATE_RESULT;
 }
 
-RESUME(access_reject)
+RESUME_FLAG(access_reject, UNUSED,)
 {
 	process_ttls_t const		*inst = talloc_get_type_abort_const(mctx->mi->data, process_ttls_t);
 
 	PROCESS_TRACE;
 
 	fr_state_discard(inst->auth.state_tree, request);
-	RETURN_MODULE_TRANSPARENT;
+	return UNLANG_ACTION_CALCULATE_RESULT;
 }
 
 RESUME(access_challenge)
@@ -441,7 +442,7 @@ RESUME(access_challenge)
 	}
 
 	fr_assert(request->reply->code == FR_RADIUS_CODE_ACCESS_CHALLENGE);
-	RETURN_MODULE_TRANSPARENT;
+	return UNLANG_ACTION_CALCULATE_RESULT;
 }
 
 RESUME(protocol_error)