remove all references to tmpl_attr_prefix

diff --git a/src/lib/ldap/map.c b/src/lib/ldap/map.c
index b573374c41e3d91ecaef67299ddc247f44f65ed3..7c2fb9d628db5f5566e2819d8cbff50fb6d7b3a3 100644 (file)
--- a/src/lib/ldap/map.c
+++ b/src/lib/ldap/map.c
@@ -70,7 +70,6 @@ int fr_ldap_map_getvalue(TALLOC_CTX *ctx, fr_pair_list_t *out, request_t *reques
                                        .dict_def = request->dict,
                                        .request_def = tmpl_request(map->lhs),
                                        .list_def = tmpl_list(map->lhs),
-                                       .prefix = TMPL_ATTR_REF_PREFIX_AUTO
                                },
                                .xlat = {
                                        .runtime_el = unlang_interpret_event_list(request),
@@ -344,7 +343,6 @@ int fr_ldap_map_do(request_t *request, char const *check_attr,
                        .attr = {
                                .dict_def = request->dict,
                                .list_def = request_attr_request,
-                               .prefix = TMPL_ATTR_REF_PREFIX_AUTO
                        },
                        .xlat = {
                                .runtime_el = unlang_interpret_event_list(request),
@@ -456,7 +454,6 @@ int fr_ldap_map_do(request_t *request, char const *check_attr,
                                .attr = {
                                        .dict_def = request->dict,
                                        .list_def = request_attr_request,
-                                       .prefix = TMPL_ATTR_REF_PREFIX_AUTO
                                },
                                .xlat = {
                                        .runtime_el = unlang_interpret_event_list(request),

diff --git a/src/lib/redis/redis.c b/src/lib/redis/redis.c
index 5364c8b27a0074ab9099d6c1f469ae56d7340ed6..7c5beedf6a2f27aed1e03ee3e33a06f21fd63920 100644 (file)
--- a/src/lib/redis/redis.c
+++ b/src/lib/redis/redis.c
@@ -395,7 +395,6 @@ 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 = {
-                                               .prefix = TMPL_ATTR_REF_PREFIX_NO,
                                                .dict_def = request->dict,
                                                .list_def = request_attr_request
                                        }

diff --git a/src/lib/server/map.c b/src/lib/server/map.c
index b541999d6a9ad59cfdc240974a218fcceaf6b35b..8de89dc579c27f4387b6a4ecb349f05566612e56 100644 (file)
--- a/src/lib/server/map.c
+++ b/src/lib/server/map.c
@@ -985,7 +985,6 @@ do_children:
                         *      is used as the parsing context of the
                         *      inner section.
                         */
-                       child_lhs_rules.attr.prefix = TMPL_ATTR_REF_PREFIX_AUTO;
                        child_lhs_rules.attr.namespace = tmpl_attr_tail_da(map->lhs);
 
                        /*
@@ -1924,7 +1923,6 @@ int map_to_request(request_t *request, map_t const *map, radius_map_getvalue_t f
                                                .attr = {
                                                        .dict_def = request->dict,
                                                        .list_def = request_attr_request,
-                                                       .prefix = TMPL_ATTR_REF_PREFIX_NO
                                                }
                                           });
                if (slen <= 0) {
@@ -2747,7 +2745,6 @@ int map_afrom_fields(TALLOC_CTX *ctx, map_t **out, map_t **parent_p, request_t *
                /*
                 *      No enums here.
                 */
-               fr_assert(my_rules.attr.prefix != TMPL_ATTR_REF_PREFIX_NO);
                fr_assert(my_rules.attr.list_def == request_attr_request);
 
        parse_as_attr:

diff --git a/src/lib/server/map_async.c b/src/lib/server/map_async.c
index 8d8f0ac870f4756f53b86c941de5ea59577b1e65..2fb5f2cc568b9499d5ca5227666d860144d52e71 100644 (file)
--- a/src/lib/server/map_async.c
+++ b/src/lib/server/map_async.c
@@ -322,7 +322,6 @@ int map_to_list_mod(TALLOC_CTX *ctx, vp_list_mod_t **out,
                                                .attr = {
                                                        .dict_def = request->dict,
                                                        .list_def = request_attr_request,
-                                                       .prefix = TMPL_ATTR_REF_PREFIX_NO
                                                }
                                           });
                if (slen <= 0) {

diff --git a/src/lib/server/tmpl_tokenize.c b/src/lib/server/tmpl_tokenize.c
index 7b6086ae58d0fe54e81cba4ef0beda5d95226e23..3f4cf44188c0b9b2040c488c5f9103eb320587a3 100644 (file)
--- a/src/lib/server/tmpl_tokenize.c
+++ b/src/lib/server/tmpl_tokenize.c
@@ -106,7 +106,6 @@ TMPL_REQUEST_REF_DEF(tmpl_request_def_parent, REQUEST_PARENT);
 #define CHECK_T_RULES do { \
        if (!t_rules) { \
                t_rules = &default_rules; \
-               default_rules.attr.prefix = TMPL_ATTR_REF_PREFIX_AUTO; \
        } \
   } while (0)
 
@@ -2254,8 +2253,6 @@ ssize_t tmpl_afrom_attr_substr(TALLOC_CTX *ctx, tmpl_attr_error_t *err,
         *      We parsed the tmpl as User-Name, but NOT %{User-Name}.
         */
        MEM(vpt = tmpl_alloc(ctx, TMPL_TYPE_ATTR, T_BARE_WORD, NULL, 0));
-       vpt->data.attribute.ref_prefix = TMPL_ATTR_REF_PREFIX_NO;
-       vpt->rules.attr.prefix = at_rules->prefix;
 
        /*
         *      The "raw." prefix marks up the leaf attribute

diff --git a/src/lib/server/users_file.c b/src/lib/server/users_file.c
index f1ee696b206d36fe8e4c5d47ae7654ab06234846..ad055a4fe0af6611e7700d7ec273d5845bed178a 100644 (file)
--- a/src/lib/server/users_file.c
+++ b/src/lib/server/users_file.c
@@ -270,7 +270,6 @@ static int pairlist_read_internal(TALLOC_CTX *ctx, fr_dict_t const *dict, char c
        lhs_rules = (tmpl_rules_t) {
                .attr = {
                        .dict_def = dict,
-                       .prefix = TMPL_ATTR_REF_PREFIX_AUTO,
                        .list_def = request_attr_request,
                        .list_presence = TMPL_ATTR_LIST_ALLOW,
                },
@@ -280,7 +279,6 @@ static int pairlist_read_internal(TALLOC_CTX *ctx, fr_dict_t const *dict, char c
        rhs_rules = (tmpl_rules_t) {
                .attr = {
                        .dict_def = dict,
-                       .prefix = TMPL_ATTR_REF_PREFIX_AUTO,
                        .list_def = request_attr_request,
                        .list_presence = TMPL_ATTR_LIST_ALLOW,
                        .bare_word_enum = v3_compat,

diff --git a/src/lib/unlang/edit.c b/src/lib/unlang/edit.c
index 423f3afb4474b61ef9064e1803ba654bbe02a6bc..bedb91b96e6f6fda0d2b052afbf8fec9bba99443 100644 (file)
--- a/src/lib/unlang/edit.c
+++ b/src/lib/unlang/edit.c
@@ -131,7 +131,6 @@ static int tmpl_attr_from_result(TALLOC_CTX *ctx, map_t const *map, edit_result_
                                        .attr = {
                                                .dict_def = request->dict,
                                                .list_def = request_attr_request,
-                                               .prefix = TMPL_ATTR_REF_PREFIX_NO
                                        }
                                   });
        if (slen <= 0) {

diff --git a/src/lib/unlang/xlat_builtin.c b/src/lib/unlang/xlat_builtin.c
index 38574f58fb011d4c9604104a7914efafc49e77b0..c7e8e175782d1da06b420b03ead25ef094184bf7 100644 (file)
--- a/src/lib/unlang/xlat_builtin.c
+++ b/src/lib/unlang/xlat_builtin.c
@@ -287,7 +287,6 @@ static xlat_action_t xlat_func_debug_attr(UNUSED TALLOC_CTX *ctx, UNUSED fr_dcur
                                                .dict_def = request->dict,
                                                .list_def = request_attr_request,
                                                .allow_wildcard = true,
-                                               .prefix = TMPL_ATTR_REF_PREFIX_AUTO
                                        }
                                }) <= 0) {
                RPEDEBUG("Invalid input");
@@ -893,7 +892,6 @@ static xlat_action_t xlat_func_immutable_attr(UNUSED TALLOC_CTX *ctx, UNUSED fr_
                                                .dict_def = request->dict,
                                                .list_def = request_attr_request,
                                                .allow_wildcard = true,
-                                               .prefix = TMPL_ATTR_REF_PREFIX_AUTO
                                        }
                                }) <= 0) {
                RPEDEBUG("Invalid input");
@@ -1254,7 +1252,6 @@ static xlat_action_t xlat_func_map(TALLOC_CTX *ctx, fr_dcursor_t *out,
                .attr = {
                        .dict_def = request->dict,
                        .list_def = request_attr_request,
-                       .prefix = TMPL_ATTR_REF_PREFIX_AUTO
                },
                .xlat = {
                        .runtime_el = unlang_interpret_event_list(request)
@@ -2399,7 +2396,6 @@ static xlat_action_t xlat_func_pairs(TALLOC_CTX *ctx, fr_dcursor_t *out,
                                                .dict_def = request->dict,
                                                .list_def = request_attr_request,
                                                .allow_wildcard = true,
-                                               .prefix = TMPL_ATTR_REF_PREFIX_AUTO
                                        }
                                }) <= 0) {
                RPEDEBUG("Invalid input");
@@ -3974,7 +3970,6 @@ static xlat_action_t protocol_encode_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
                                                .dict_def = request->dict,
                                                .list_def = request_attr_request,
                                                .allow_wildcard = true,
-                                               .prefix = TMPL_ATTR_REF_PREFIX_AUTO
                                        }
                                }) <= 0) {
                RPEDEBUG("Failed parsing attribute reference");

diff --git a/src/lib/unlang/xlat_expr.c b/src/lib/unlang/xlat_expr.c
index d0b5f8a4ac1a01627405011723541af484ebcadc..745299daa0acca3212b22753ddd8ca03bfc3ad6a 100644 (file)
--- a/src/lib/unlang/xlat_expr.c
+++ b/src/lib/unlang/xlat_expr.c
@@ -1738,7 +1738,6 @@ static xlat_action_t xlat_exists_resume(TALLOC_CTX *ctx, fr_dcursor_t *out,
                                                   .dict_def = request->dict,
                                                   .request_def = &tmpl_request_def_current,
                                                   .list_def = request_attr_request,
-                                                  .prefix = TMPL_ATTR_REF_PREFIX_AUTO,
                                                   .allow_unknown = false,
                                                   .allow_unresolved = false,
                                           },
@@ -2805,12 +2804,6 @@ static fr_slen_t tokenize_field(xlat_exp_head_t *head, xlat_exp_t **out, fr_sbuf
        } else if (tmpl_is_attr(node->vpt)) {
                node->flags.pure = node->flags.can_purify = false;
 
-#ifndef NDEBUG
-               if (vpt->name[0] == '%') {
-                       fr_assert(vpt->rules.attr.prefix == TMPL_ATTR_REF_PREFIX_NO);
-               }
-#endif
-
        } else {
                node->flags.pure = false;
        }

diff --git a/src/lib/unlang/xlat_tokenize.c b/src/lib/unlang/xlat_tokenize.c
index f4a0b4d626a8110f48e2afb74e0412357c22f2c6..182d4986d4691fdfbf2cd5adb91d25733d21572a 100644 (file)
--- a/src/lib/unlang/xlat_tokenize.c
+++ b/src/lib/unlang/xlat_tokenize.c
@@ -476,7 +476,6 @@ static CC_HINT(nonnull(1,2,4)) ssize_t xlat_tokenize_attribute(xlat_exp_head_t *
         */
        our_t_rules = *t_rules;
        our_t_rules.attr.allow_wildcard = true;
-       our_t_rules.attr.prefix = TMPL_ATTR_REF_PREFIX_NO;
 
        fr_sbuff_marker(&m_s, in);
 

diff --git a/src/modules/rlm_cache/rlm_cache.c b/src/modules/rlm_cache/rlm_cache.c
index 90856ea5923a69a2b0945a1961ea9ee3d0095826..9a86ef6b4ae63722d70b91c760fb95d6ca1f1711 100644 (file)
--- a/src/modules/rlm_cache/rlm_cache.c
+++ b/src/modules/rlm_cache/rlm_cache.c
@@ -910,7 +910,6 @@ xlat_action_t cache_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
                                        .attr = {
                                                .dict_def = request->dict,
                                                .list_def = request_attr_request,
-                                               .prefix = TMPL_ATTR_REF_PREFIX_AUTO
                                        }
                                      });
        if (slen <= 0) {

diff --git a/src/modules/rlm_cache/serialize.c b/src/modules/rlm_cache/serialize.c
index d7e3888200d15349c869da69fc2e4b6e74c2ccd9..4625d80e502f415686eaa782da25fcb908dc036e 100644 (file)
--- a/src/modules/rlm_cache/serialize.c
+++ b/src/modules/rlm_cache/serialize.c
@@ -115,7 +115,6 @@ int cache_deserialize(request_t *request, rlm_cache_entry_t *c, fr_dict_t const
                        .attr = {
                                .dict_def = dict,
                                .list_def = request_attr_request,
-                               .prefix = TMPL_ATTR_REF_PREFIX_NO
                        },
                        .xlat = {
                                .runtime_el = unlang_interpret_event_list(request),

diff --git a/src/modules/rlm_dict/rlm_dict.c b/src/modules/rlm_dict/rlm_dict.c
index 8c4a99af55480c6f728b2353d5a14defd8d50611..6edb366690f0a477bc8008e1315508d5b56ba6c7 100644 (file)
--- a/src/modules/rlm_dict/rlm_dict.c
+++ b/src/modules/rlm_dict/rlm_dict.c
@@ -54,7 +54,6 @@ static int xlat_fmt_get_vp(fr_pair_t **out, request_t *request, char const *name
                                        .attr = {
                                                .dict_def = request->dict,
                                                .list_def = request_attr_request,
-                                               .prefix = TMPL_ATTR_REF_PREFIX_AUTO
                                        }
                                }) <= 0) return -4;
 

diff --git a/src/modules/rlm_exec/rlm_exec.c b/src/modules/rlm_exec/rlm_exec.c
index 0edab6ca8df75589a874eb700b432a993bee6aef..e829f062d36df6dea07fcddb1d00d14cd06278d3 100644 (file)
--- a/src/modules/rlm_exec/rlm_exec.c
+++ b/src/modules/rlm_exec/rlm_exec.c
@@ -301,7 +301,6 @@ static unlang_action_t mod_exec_oneshot_wait_resume(rlm_rcode_t *p_result, modul
                        tmpl_rules_t    lhs_rules = (tmpl_rules_t) {
                                .attr = {
                                        .dict_def = request->dict,
-                                       .prefix = TMPL_ATTR_REF_PREFIX_AUTO,
                                        .list_def = tmpl_list(inst->output_list),
                                        .list_presence = TMPL_ATTR_LIST_ALLOW,
 
@@ -317,7 +316,6 @@ static unlang_action_t mod_exec_oneshot_wait_resume(rlm_rcode_t *p_result, modul
                        };
                        tmpl_rules_t    rhs_rules = lhs_rules;
 
-                       rhs_rules.attr.prefix = TMPL_ATTR_REF_PREFIX_AUTO;
                        rhs_rules.attr.list_def = request_attr_request;
                        rhs_rules.at_runtime = true;
                        rhs_rules.xlat.runtime_el = unlang_interpret_event_list(request);

diff --git a/src/modules/rlm_ldap/profile.c b/src/modules/rlm_ldap/profile.c
index d97abb42164e19fb506a4ba0f89094e7e5f7f03f..7ae822c98bcfcb6020f5b616a7f6c8757ed69308 100644 (file)
--- a/src/modules/rlm_ldap/profile.c
+++ b/src/modules/rlm_ldap/profile.c
@@ -125,7 +125,6 @@ static unlang_action_t ldap_map_profile_resume(UNUSED rlm_rcode_t *p_result, UNU
                                .attr = {
                                        .dict_def = request->dict,
                                        .list_def = request_attr_request,
-                                       .prefix = TMPL_ATTR_REF_PREFIX_AUTO
                                },
                                .xlat = {
                                        .runtime_el = unlang_interpret_event_list(request),

diff --git a/src/modules/rlm_linelog/rlm_linelog.c b/src/modules/rlm_linelog/rlm_linelog.c
index 212b45cc154282ae575e8854c8c0e44af9d95fef..0e4215001bfa8573db7678e52d7c7a5eb3d2d07d 100644 (file)
--- a/src/modules/rlm_linelog/rlm_linelog.c
+++ b/src/modules/rlm_linelog/rlm_linelog.c
@@ -762,7 +762,6 @@ static unlang_action_t CC_HINT(nonnull) mod_do_linelog(rlm_rcode_t *p_result, mo
                                                        .dict_def = request->dict,
                                                        .allow_unknown = true,
                                                        .allow_unresolved = false,
-                                                       .prefix = TMPL_ATTR_REF_PREFIX_AUTO,
                                                },
                                                .xlat = {
                                                        .runtime_el = unlang_interpret_event_list(request),

diff --git a/src/modules/rlm_mruby/rlm_mruby.c b/src/modules/rlm_mruby/rlm_mruby.c
index cd8fa89be2755f063159651dcc793d5e1c5390f9..d9b81ff1519d5dfff082e26b87b3460af8ed4da6 100644 (file)
--- a/src/modules/rlm_mruby/rlm_mruby.c
+++ b/src/modules/rlm_mruby/rlm_mruby.c
@@ -363,7 +363,6 @@ static void add_vp_tuple(TALLOC_CTX *ctx, request_t *request, fr_pair_list_t *vp
                                                .attr = {
                                                        .dict_def = request->dict,
                                                        .list_def = request_attr_reply,
-                                                       .prefix = TMPL_ATTR_REF_PREFIX_AUTO,
                                                }
                                        }) <= 0) {
                        ERROR("Failed to find attribute %s", ckey);

diff --git a/src/modules/rlm_python/rlm_python.c b/src/modules/rlm_python/rlm_python.c
index f574f95662fad80605f69c11da2ea7f90e7a663c..7400b0fc6e74fe673dfc0d3e3d037ed926b22431 100644 (file)
--- a/src/modules/rlm_python/rlm_python.c
+++ b/src/modules/rlm_python/rlm_python.c
@@ -338,7 +338,6 @@ static void mod_vptuple(TALLOC_CTX *ctx, module_ctx_t const *mctx, request_t *re
                                                .attr = {
                                                        .dict_def = request->dict,
                                                        .list_def = request_attr_reply,
-                                                       .prefix = TMPL_ATTR_REF_PREFIX_AUTO,
                                                }
                                        }) <= 0) {
                        PERROR("%s - Failed to find attribute %s.%s", funcname, list_name, s1);

diff --git a/src/modules/rlm_radius/rlm_radius.c b/src/modules/rlm_radius/rlm_radius.c
index fa7bd460d17a8c3e3598699b46b7de57909c5762..46f59c27a79000fd079df0842ea848390fcf2a6b 100644 (file)
--- a/src/modules/rlm_radius/rlm_radius.c
+++ b/src/modules/rlm_radius/rlm_radius.c
@@ -497,7 +497,6 @@ static int status_check_update_parse(TALLOC_CTX *ctx, void *out, void *parent,
                                .namespace = fr_dict_root(dict_radius),
                                .list_def = request_attr_request,
                                .list_presence = TMPL_ATTR_LIST_FORBID,
-                               .prefix = TMPL_ATTR_REF_PREFIX_AUTO,
                        },
                        .literals_safe_for = FR_VALUE_BOX_SAFE_FOR_ANY,
                };

diff --git a/src/modules/rlm_rest/rest.c b/src/modules/rlm_rest/rest.c
index b8e5f52f99f5c03c0c1f9ff8c217ff1287803d8f..ec936891dfb0f216f0b5a8bd8110c11f94f12d65 100644 (file)
--- a/src/modules/rlm_rest/rest.c
+++ b/src/modules/rlm_rest/rest.c
@@ -735,7 +735,6 @@ 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 = {
-                                                       .prefix = TMPL_ATTR_REF_PREFIX_NO,
                                                        .dict_def = request->dict,
                                                        .list_def = request_attr_reply
                                                }
@@ -1026,7 +1025,6 @@ 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 = {
-                                                               .prefix = TMPL_ATTR_REF_PREFIX_NO,
                                                                .dict_def = request->dict,
                                                                .list_def = request_attr_reply
                                                        }

diff --git a/src/modules/rlm_sql/sql.c b/src/modules/rlm_sql/sql.c
index fea9621ee9cc4bff58e6bd44bae19f2392525506..df5e4f53ad7e96d8624d41a67bce8cef3ad5ba55 100644 (file)
--- a/src/modules/rlm_sql/sql.c
+++ b/src/modules/rlm_sql/sql.c
@@ -298,7 +298,6 @@ static unlang_action_t sql_get_map_list_resume(rlm_rcode_t *p_result, UNUSED int
        tmpl_rules_t            lhs_rules = (tmpl_rules_t) {
                .attr = {
                        .dict_def = request->dict,
-                       .prefix = TMPL_ATTR_REF_PREFIX_AUTO,
                        .list_def = map_ctx->list,
                        .list_presence = TMPL_ATTR_LIST_ALLOW
                }
@@ -309,7 +308,6 @@ static unlang_action_t sql_get_map_list_resume(rlm_rcode_t *p_result, UNUSED int
        map_t           *parent = NULL;
        rlm_sql_t const *inst = map_ctx->inst;
 
-       rhs_rules.attr.prefix = TMPL_ATTR_REF_PREFIX_AUTO;
        rhs_rules.attr.list_def = request_attr_request;
 
        if (query_ctx->rcode != RLM_SQL_OK) RETURN_MODULE_FAIL;