From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Sun, 18 May 2025 21:16:35 +0000 (-0600)
Subject: Now that rcode works correctly, having OR or AND fail when their children fail causes... 
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4086074515;p=thirdparty%2Ffreeradius-server.git

Now that rcode works correctly, having OR or AND fail when their children fail causes tests to fail
---

diff --git a/src/lib/unlang/xlat_expr.c b/src/lib/unlang/xlat_expr.c
index d9d326329cb..d88f2c72225 100644
--- a/src/lib/unlang/xlat_expr.c
+++ b/src/lib/unlang/xlat_expr.c
@@ -1213,16 +1213,6 @@ static xlat_action_t xlat_logical_or_resume(TALLOC_CTX *ctx, fr_dcursor_t *out,
 	xlat_logical_rctx_t	*rctx = talloc_get_type_abort(xctx->rctx, xlat_logical_rctx_t);
 	bool			match;
 
-	/*
-	 *	If one of the expansions fails, then we fail the
-	 *	entire thing.
-	 */
-	if (!rctx->last_success) {
-		talloc_free(rctx->box);
-		talloc_free(rctx);
-		return XLAT_ACTION_FAIL;
-	}
-
 	/*
 	 *	Recursively check groups.  i.e. we effectively flatten each list.
 	 *
@@ -1318,16 +1308,6 @@ static xlat_action_t xlat_logical_and_resume(TALLOC_CTX *ctx, fr_dcursor_t *out,
 	xlat_logical_rctx_t	*rctx = talloc_get_type_abort(xctx->rctx, xlat_logical_rctx_t);
 	bool			match;
 
-	/*
-	 *	If one of the expansions fails, then we fail the
-	 *	entire thing.
-	 */
-	if (!rctx->last_success) {
-		talloc_free(rctx->box);
-		talloc_free(rctx);
-		return XLAT_ACTION_FAIL;
-	}
-
 	/*
 	 *	Recursively check groups.  i.e. we effectively flatten each list.
 	 *