From: Alan T. DeKok <aland@freeradius.org>
Date: Wed, 27 Jul 2022 12:51:37 +0000 (-0400)
Subject: handle list_as_attr when resolving virtual attributes
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=04116f451fabad5b8a9764a38c0d34bf34e66733;p=thirdparty%2Ffreeradius-server.git

handle list_as_attr when resolving virtual attributes
---

diff --git a/src/lib/unlang/xlat_tokenize.c b/src/lib/unlang/xlat_tokenize.c
index 082ce4d3a33..8f9fd859899 100644
--- a/src/lib/unlang/xlat_tokenize.c
+++ b/src/lib/unlang/xlat_tokenize.c
@@ -693,7 +693,7 @@ static inline int xlat_tokenize_attribute(xlat_exp_head_t *head, fr_sbuff_t *in,
 		/*
 		 *	Could it be a virtual attribute?
 		 */
-		if ((tmpl_attr_count(vpt) == 1) && (xlat_resolve_virtual_attribute(node, vpt) == 0)) goto done;
+		if ((tmpl_attr_count(vpt) == (1 + vpt->rules.attr.list_as_attr)) && (xlat_resolve_virtual_attribute(node, vpt) == 0)) goto done;
 
 		if (!t_rules || !t_rules->attr.allow_unresolved) {
 			talloc_free(vpt);