From: Alan T. DeKok <aland@freeradius.org>
Date: Fri, 16 Sep 2022 00:46:53 +0000 (-0400)
Subject: always set node->fmt
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f2c46c8af4a41bb45fa7338c14694b7804c81ce7;p=thirdparty%2Ffreeradius-server.git

always set node->fmt
---

diff --git a/src/lib/unlang/xlat_expr.c b/src/lib/unlang/xlat_expr.c
index 81ccc8e2a1f..c9d73b58a3e 100644
--- a/src/lib/unlang/xlat_expr.c
+++ b/src/lib/unlang/xlat_expr.c
@@ -1068,6 +1068,7 @@ static int xlat_expr_logical_purify(xlat_exp_t *node, void *instance, request_t
 
 	xlat_inst_remove(node);
 	node->type = XLAT_GROUP;
+	node->fmt = group->fmt;
 	node->group = group;
 	node->flags = group->flags;
 
@@ -2307,7 +2308,7 @@ static fr_slen_t tokenize_field(xlat_exp_head_t *head, xlat_exp_t **out, fr_sbuf
 		fr_type_t type;
 
 		talloc_steal(node, xlat);
-		node->fmt = talloc_typed_strdup(node, node->fmt);
+		node->fmt = talloc_typed_strdup(node, vpt->name);
 		talloc_free(vpt);
 
 		xlat_exp_set_type(node, XLAT_GROUP);