From: Alan T. DeKok <aland@freeradius.org>
Date: Tue, 17 Jun 2025 15:44:23 +0000 (-0400)
Subject: failed expanding RHS xlat is an rcode FAIL
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d0713b0e4f74ac4df3ebec63fba175fcea0322e9;p=thirdparty%2Ffreeradius-server.git

failed expanding RHS xlat is an rcode FAIL
---

diff --git a/src/lib/unlang/edit.c b/src/lib/unlang/edit.c
index caf694c869f..425359be71d 100644
--- a/src/lib/unlang/edit.c
+++ b/src/lib/unlang/edit.c
@@ -51,6 +51,7 @@ typedef struct {
 	tmpl_t const		*vpt;			//!< expanded tmpl
 	tmpl_t			*to_free;		//!< tmpl to free.
 	bool			create;			//!< whether we need to create the VP
+	bool			success;		//!< did the xlat succeed?
 	fr_pair_t		*vp;			//!< VP referenced by tmpl.
 	fr_pair_t		*vp_parent;		//!< parent of the current VP
 	fr_pair_list_t		pair_list;		//!< for structural attributes
@@ -165,7 +166,7 @@ static int tmpl_to_values(TALLOC_CTX *ctx, edit_result_t *out, request_t *reques
 		return 1;
 
 	case TMPL_TYPE_XLAT:
-		if (unlang_xlat_push(ctx, NULL, &out->result, request, tmpl_xlat(vpt), false) < 0) return -1;
+		if (unlang_xlat_push(ctx, &out->success, &out->result, request, tmpl_xlat(vpt), false) < 0) return -1;
 		return 1;
 
 	default:
@@ -972,6 +973,15 @@ static int check_rhs(request_t *request, unlang_frame_state_edit_t *state, edit_
 {
 	map_t const *map = current->map;
 
+	if (!current->rhs.success) {
+		if (map->rhs) {
+			RDEBUG("Failed expanding ... %s", map->rhs->name);
+		} else {
+			RDEBUG("Failed assigning to %s", map->lhs->name);
+		}
+		return -1;
+	}
+
 	XDEBUG("%s map %s %s ...", __FUNCTION__, map->lhs->name, fr_tokens[map->op]);
 
 	/*
@@ -1572,6 +1582,8 @@ static unlang_action_t process_edit(rlm_rcode_t *p_result, request_t *request, u
 				XDEBUG("MAP %s ... %s", state->current->map->lhs->name, state->current->map->rhs->name);
 			}
 
+			state->current->lhs.success = state->current->rhs.success = true;
+
 			rcode = state->current->func(request, state, state->current);
 			if (rcode < 0) {
 				RINDENT_RESTORE(request, state);