From: Nick Porter <nick@portercomputing.co.uk>
Date: Thu, 19 Jan 2023 18:41:57 +0000 (+0000)
Subject: Update tmpl_attr_afrom_attr_substr() to handle tmpls such as &reply.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=60833e3de1ef1950f30ecb7f2b4b749f230fdae8;p=thirdparty%2Ffreeradius-server.git

Update tmpl_attr_afrom_attr_substr() to handle tmpls such as &reply.

&reply refers to the existence of the list, &reply. refers to the
presence of children in the list.
---

diff --git a/src/lib/server/tmpl_tokenize.c b/src/lib/server/tmpl_tokenize.c
index 2d1142c3601..4ce97f60787 100644
--- a/src/lib/server/tmpl_tokenize.c
+++ b/src/lib/server/tmpl_tokenize.c
@@ -1979,7 +1979,8 @@ do_suffix:
 		tmpl_attr_insert(vpt, ar);
 	}
 
-	if (tmpl_is_attr(vpt) && (tmpl_rules_cast(vpt) == tmpl_attr_tail_da(vpt)->type)) vpt->rules.cast = FR_TYPE_NULL;
+	if (tmpl_is_attr(vpt) && tmpl_attr_tail_is_normal(vpt) &&
+	    (tmpl_rules_cast(vpt) == tmpl_attr_tail_da(vpt)->type)) vpt->rules.cast = FR_TYPE_NULL;
 
 	fr_sbuff_marker_release(&m_s);
 	return 0;