dict_def should always be local_dict

diff --git a/src/lib/ldap/map.c b/src/lib/ldap/map.c
index 2d94ed0d5cc6856f26946e1976c3d68907718486..833a104760e731f7a77aabd84de5e4f8a9e41837 100644 (file)
--- 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 d340c86e25d6c1cb3d0572834c4f0bbeba13c049..99ff4b3e7506418ee7b07e2dfe7e5d6db4a09706 100644 (file)
--- 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 de333f4740c3d567739d3b7499ab40e0c4e7e929..b987fd95ff5a6e3c1301090b806b3d5316fcabf6 100644 (file)
--- 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 2311d32b05100e642e8048e9a7ff43471ce94435..6270bfb420c0983ee86b71e0e0f09270b2adee04 100644 (file)
--- 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 7837207b4bf6410ae4992f2daaab2c30e0f01797..a9ce6c9083f2d7f73aa7ca2792370703a7fc9a38 100644 (file)
--- 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 1e10053d503c894c9dbcef5603a6977470c28912..fdeab9d8949429b3c23f544b56622ab729335d80 100644 (file)
--- 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 a0aa62a9d9ff4df8f234f01affe51e6602dff675..e5d8ea3c8be7e7fe79e55b68a323b92431553185 100644 (file)
--- 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 a91c1407dbbf0333352c4e443a59d74283ff63ab..f6249ff8e9e0850a533b8e74c873c794f2cdd136 100644 (file)
--- 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) {