tmpl: Fix other weirdly named accessors

FreeRADIUS · May 8, 2020 · b111f3e · b111f3e
1 parent baa8cb6
commit b111f3e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/lib/unlang/compile.c b/src/lib/unlang/compile.c
@@ -382,16 +382,16 @@ static bool pass2_fixup_undefined(CONF_ITEM const *ci, vp_tmpl_t *vpt, vp_tmpl_r
 
 	fr_assert(tmpl_is_attr_unparsed(vpt));
 
-	if (fr_dict_attr_by_qualified_name(&da, rules->dict_def, tmpl_unknown_name(vpt), true) != FR_DICT_ATTR_OK) {
+	if (fr_dict_attr_by_qualified_name(&da, rules->dict_def, tmpl_attr_unparsed(vpt), true) != FR_DICT_ATTR_OK) {
 		ssize_t slen;
 		fr_dict_attr_t *unknown_da;
 
 		/*
 		 *	Can't find it under it's regular name.  Try an unknown attribute.
 		 */
 		slen = fr_dict_unknown_afrom_oid_str(vpt, &unknown_da, fr_dict_root(rules->dict_def),
-						     tmpl_unknown_name(vpt));
-		if ((slen <= 0) || (tmpl_unknown_name(vpt)[slen] != '\0')) {
+						     tmpl_attr_unparsed(vpt));
+		if ((slen <= 0) || (tmpl_attr_unparsed(vpt)[slen] != '\0')) {
 			cf_log_perr(ci, "Failed resolving undefined attribute");
 			return false;
 		}

diff --git a/src/lib/unlang/xlat_tokenize.c b/src/lib/unlang/xlat_tokenize.c
@@ -394,10 +394,10 @@ static inline ssize_t xlat_tokenize_attribute(TALLOC_CTX *ctx, xlat_exp_t **head
 	 *	list.
 	 */
 	if (tmpl_is_attr_unparsed(vpt)) {
-		func = xlat_func_find(tmpl_unknown_name(vpt), -1);
+		func = xlat_func_find(tmpl_attr_unparsed(vpt), -1);
 		if (func && (func->type == XLAT_FUNC_SYNC)) {
 			node = xlat_exp_alloc(ctx, XLAT_VIRTUAL,
-					      tmpl_unknown_name(vpt), talloc_array_length(tmpl_unknown_name(vpt)) - 1);
+					      tmpl_attr_unparsed(vpt), talloc_array_length(tmpl_attr_unparsed(vpt)) - 1);
 			talloc_free(vpt);	/* Free the tmpl, we don't need it */
 
 			XLAT_DEBUG("VIRTUAL <-- %s", node->fmt);