From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Fri, 26 Sep 2025 23:06:22 +0000 (-0400)
Subject: dict_def should always be local_dict
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=30c99b1aae9477881e886830c753beb164ba34b7;p=thirdparty%2Ffreeradius-server.git

dict_def should always be local_dict
---

diff --git a/src/lib/ldap/map.c b/src/lib/ldap/map.c
index 2d94ed0d5c..833a104760 100644
--- a/src/lib/ldap/map.c
+++ b/src/lib/ldap/map.c
@@ -348,7 +348,7 @@ int fr_ldap_map_do(request_t *request, char const *check_attr,
 		int		count, i;
 		tmpl_rules_t const parse_rules = {
 			.attr = {
-				.dict_def = request->proto_dict,
+				.dict_def = request->local_dict,
 				.list_def = request_attr_request,
 			},
 			.xlat = {
@@ -459,7 +459,7 @@ int fr_ldap_map_do(request_t *request, char const *check_attr,
 
 			tmpl_rules_t const parse_rules = {
 				.attr = {
-					.dict_def = request->proto_dict,
+					.dict_def = request->local_dict,
 					.list_def = request_attr_request,
 				},
 				.xlat = {
diff --git a/src/lib/redis/redis.c b/src/lib/redis/redis.c
index d340c86e25..99ff4b3e75 100644
--- a/src/lib/redis/redis.c
+++ b/src/lib/redis/redis.c
@@ -395,7 +395,7 @@ int fr_redis_reply_to_map(TALLOC_CTX *ctx, map_list_t *out, request_t *request,
 	slen = tmpl_afrom_attr_str(map, NULL, &map->lhs, key->str,
 				   &(tmpl_rules_t){
 				   	.attr = {
-						.dict_def = request->proto_dict,
+						.dict_def = request->local_dict,
 						.list_def = request_attr_request
 				   	}
 				   });
diff --git a/src/lib/unlang/xlat_eval.c b/src/lib/unlang/xlat_eval.c
index de333f4740..b987fd95ff 100644
--- a/src/lib/unlang/xlat_eval.c
+++ b/src/lib/unlang/xlat_eval.c
@@ -547,7 +547,7 @@ check_non_leaf:
 		if (tmpl_afrom_attr_str(ctx, NULL, &vpt, vb->vb_strvalue,
 					&(tmpl_rules_t){
 						.attr = {
-							.dict_def = request->proto_dict, /* we can't encode local attributes */
+							.dict_def = request->local_dict,
 							.list_def = request_attr_request,
 							.allow_wildcard = arg->allow_wildcard,
 						}
diff --git a/src/modules/rlm_cache/rlm_cache.c b/src/modules/rlm_cache/rlm_cache.c
index 2311d32b05..6270bfb420 100644
--- a/src/modules/rlm_cache/rlm_cache.c
+++ b/src/modules/rlm_cache/rlm_cache.c
@@ -910,7 +910,7 @@ xlat_action_t cache_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
 				      NULL,
 				      &(tmpl_rules_t){
 				      	.attr = {
-						.dict_def = request->proto_dict,
+						.dict_def = request->local_dict,
 						.list_def = request_attr_request,
 				      	}
 				      });
diff --git a/src/modules/rlm_dict/rlm_dict.c b/src/modules/rlm_dict/rlm_dict.c
index 7837207b4b..a9ce6c9083 100644
--- a/src/modules/rlm_dict/rlm_dict.c
+++ b/src/modules/rlm_dict/rlm_dict.c
@@ -52,7 +52,7 @@ static int xlat_fmt_get_vp(fr_pair_t **out, request_t *request, char const *name
 	if (tmpl_afrom_attr_str(request, NULL, &vpt, name,
 				&(tmpl_rules_t){
 					.attr = {
-						.dict_def = request->proto_dict,
+						.dict_def = request->local_dict,
 						.list_def = request_attr_request,
 					}
 				}) <= 0) return -4;
diff --git a/src/modules/rlm_ldap/groups.c b/src/modules/rlm_ldap/groups.c
index 1e10053d50..fdeab9d894 100644
--- a/src/modules/rlm_ldap/groups.c
+++ b/src/modules/rlm_ldap/groups.c
@@ -816,7 +816,7 @@ unlang_action_t rlm_ldap_check_groupobj_dynamic(unlang_result_t *p_result, reque
 
 		t_rules = (tmpl_rules_t){
 			.attr = {
-				.dict_def = request->proto_dict,
+				.dict_def = request->local_dict,
 				.list_def = request_attr_request,
 			},
 			.xlat = {
diff --git a/src/modules/rlm_ldap/profile.c b/src/modules/rlm_ldap/profile.c
index a0aa62a9d9..e5d8ea3c8b 100644
--- a/src/modules/rlm_ldap/profile.c
+++ b/src/modules/rlm_ldap/profile.c
@@ -122,7 +122,7 @@ static unlang_action_t ldap_map_profile_resume(request_t *request, void *uctx)
 
 			tmpl_rules_t const parse_rules = {
 				.attr = {
-					.dict_def = request->proto_dict,
+					.dict_def = request->local_dict,
 					.list_def = request_attr_request,
 				},
 				.xlat = {
diff --git a/src/modules/rlm_rest/rest.c b/src/modules/rlm_rest/rest.c
index a91c1407db..f6249ff8e9 100644
--- a/src/modules/rlm_rest/rest.c
+++ b/src/modules/rlm_rest/rest.c
@@ -740,7 +740,7 @@ static int rest_decode_post(UNUSED rlm_rest_t const *instance, UNUSED rlm_rest_s
 		if (tmpl_afrom_attr_str(request, NULL, &dst, name,
 					&(tmpl_rules_t){
 						.attr = {
-							.dict_def = request->proto_dict,
+							.dict_def = request->local_dict,
 							.list_def = request_attr_reply
 						}
 					}) <= 0) {
@@ -1030,7 +1030,7 @@ static int json_pair_alloc(rlm_rest_t const *instance, rlm_rest_section_t const
 			if (tmpl_afrom_attr_str(request, NULL, &dst, name,
 						&(tmpl_rules_t){
 							.attr = {
-								.dict_def = request->proto_dict,
+								.dict_def = request->local_dict,
 								.list_def = request_attr_reply
 							}
 						}) <= 0) {