From: Alan T. DeKok <aland@freeradius.org>
Date: Thu, 7 Jul 2022 14:06:52 +0000 (-0400)
Subject: resolve all tmpls which need resolving
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=80ed404fe2d28c2545ec164b78d1419ca3d6936b;p=thirdparty%2Ffreeradius-server.git

resolve all tmpls which need resolving
---

diff --git a/src/lib/unlang/xlat_tokenize.c b/src/lib/unlang/xlat_tokenize.c
index f53ff884252..30337e4d423 100644
--- a/src/lib/unlang/xlat_tokenize.c
+++ b/src/lib/unlang/xlat_tokenize.c
@@ -1910,10 +1910,10 @@ int xlat_resolve(xlat_exp_head_t *head, xlat_res_rules_t const *xr_rules)
 				if (!xr_rules->allow_unresolved) {
 				error_unresolved:
 					if (node->quote == T_BARE_WORD) {
-						fr_strerror_printf_push("Failed resolving attribute in expansion: %s",
+						fr_strerror_printf_push("Failed resolving expansion: %s",
 									node->fmt);
 					} else {
-						fr_strerror_printf_push("Failed resolving attribute in expansion: %c%s%c",
+						fr_strerror_printf_push("Failed resolving expansion: %c%s%c",
 									fr_token_quote[node->quote], node->fmt, fr_token_quote[node->quote]);
 					}
 					return -1;
@@ -1938,16 +1938,13 @@ int xlat_resolve(xlat_exp_head_t *head, xlat_res_rules_t const *xr_rules)
 			 *	Double-quoted etc. strings may contain xlats, so we try to resolve them now.
 			 *	Or, convert them to data.
 			 */
-			if (node->quote != T_BARE_WORD) {
-				if (tmpl_resolve(node->vpt, xr_rules->tr_rules) < 0) return -1;
-
-				node->flags.needs_resolving = false;
-				node->flags.pure = tmpl_is_data(node->vpt);
-				break;
-			}
+			if (tmpl_resolve(node->vpt, xr_rules->tr_rules) < 0) return -1;
 
+			node->flags.needs_resolving = false;
+			node->flags.pure = tmpl_is_data(node->vpt);
 			break;
 
+
 		default:
 			fr_assert(0);	/* Should not have been marked as unresolved */
 			return -1;