s/PAIR_LIST_<list>/request_attr_<list>/

and remove PAIR_LIST_<list> macros

diff --git a/src/bin/unit_test_attribute.c b/src/bin/unit_test_attribute.c
index 352cd56974c9ea08a45cf11560f32cba5d1afadf..0612dbff811217cd21c71a8fbca5cb4f79c90751 100644 (file)
--- a/src/bin/unit_test_attribute.c
+++ b/src/bin/unit_test_attribute.c
@@ -2833,7 +2833,7 @@ static size_t command_xlat_normalise(command_result_t *result, command_file_ctx_
                                        .attr = {
                                                .dict_def = cc->tmpl_rules.attr.dict_def ?
                                                cc->tmpl_rules.attr.dict_def : cc->config->dict,
-                                               .list_def = PAIR_LIST_REQUEST,
+                                               .list_def = request_attr_request,
                                                .allow_unresolved = cc->tmpl_rules.attr.allow_unresolved
                                        },
                                });
@@ -2870,7 +2870,7 @@ static size_t command_xlat_expr(command_result_t *result, command_file_ctx_t *cc
                                                        .dict_def = cc->tmpl_rules.attr.dict_def ?
                                                           cc->tmpl_rules.attr.dict_def : cc->config->dict,
                                                        .allow_unresolved = cc->tmpl_rules.attr.allow_unresolved,
-                                                       .list_def = PAIR_LIST_REQUEST,
+                                                       .list_def = request_attr_request,
                                                }
                                           });
        if (dec_len <= 0) {
@@ -2910,7 +2910,7 @@ static size_t command_xlat_purify(command_result_t *result, command_file_ctx_t *
                                                        .dict_def = cc->tmpl_rules.attr.dict_def ?
                                                           cc->tmpl_rules.attr.dict_def : cc->config->dict,
                                                        .allow_unresolved = cc->tmpl_rules.attr.allow_unresolved,
-                                                       .list_def = PAIR_LIST_REQUEST,
+                                                       .list_def = request_attr_request,
                                                   },
                                           });
        if (dec_len <= 0) {
@@ -2963,7 +2963,7 @@ static size_t command_xlat_argv(command_result_t *result, command_file_ctx_t *cc
                                          .attr = {
                                                  .dict_def = cc->tmpl_rules.attr.dict_def ?
                                                  cc->tmpl_rules.attr.dict_def : cc->config->dict,
-                                                 .list_def = PAIR_LIST_REQUEST,
+                                                 .list_def = request_attr_request,
                                                  .allow_unresolved = cc->tmpl_rules.attr.allow_unresolved
                                          },
                                  });
@@ -3346,7 +3346,7 @@ static command_file_ctx_t *command_ctx_alloc(TALLOC_CTX *ctx,
 
        cc->fuzzer_dir = -1;
 
-       cc->tmpl_rules.attr.list_def = PAIR_LIST_REQUEST;
+       cc->tmpl_rules.attr.list_def = request_attr_request;
 
        return cc;
 }

diff --git a/src/bin/unit_test_map.c b/src/bin/unit_test_map.c
index a16bcc5137a7c40ac5cf63063ec8ccb41c3093e6..dab4a4a4f6074f4495f9be85f8cfa8899c312595 100644 (file)
--- a/src/bin/unit_test_map.c
+++ b/src/bin/unit_test_map.c
@@ -84,7 +84,7 @@ static int process_file(char const *filename)
        tmpl_rules_t    parse_rules = {
                .attr = {
                        .dict_def = dict_radius,
-                       .list_def = PAIR_LIST_REQUEST,
+                       .list_def = request_attr_request,
                        .allow_foreign = false, /* tests are in the RADIUS dictionary */
                }
        };

diff --git a/src/bin/unit_test_module.c b/src/bin/unit_test_module.c
index 414f3f0f60a76d22ab08583e9f31bf7d9f57f738..39461973eaee82a7a54df82d69f7cf5ec9b9304c 100644 (file)
--- a/src/bin/unit_test_module.c
+++ b/src/bin/unit_test_module.c
@@ -440,7 +440,7 @@ static bool do_xlats(fr_event_list_t *el, char const *filename, FILE *fp)
                                                                  &(tmpl_rules_t) {
                                                                          .attr = {
                                                                                  .dict_def = dict_protocol,
-                                                                                 .list_def = PAIR_LIST_REQUEST,
+                                                                                 .list_def = request_attr_request,
                                                                                  .allow_unresolved = true,
                                                                          }
                                                                  }

diff --git a/src/lib/server/cf_file.c b/src/lib/server/cf_file.c
index 092659148aadc2efb82c067d9ff562c233e29cb0..f816e67b8e7a58abdbffdd5fe8f00d71ad0dba3f 100644 (file)
--- a/src/lib/server/cf_file.c
+++ b/src/lib/server/cf_file.c
@@ -1499,7 +1499,7 @@ static CONF_ITEM *process_if(cf_stack_t *stack)
        t_rules = (tmpl_rules_t) {
                .attr = {
                        .dict_def = dict,
-                       .list_def = PAIR_LIST_REQUEST,
+                       .list_def = request_attr_request,
                        .allow_unresolved = true,
                        .allow_unknown = true
                }

diff --git a/src/lib/server/cf_parse.c b/src/lib/server/cf_parse.c
index a700daef380e0f99a463fce6cb85a63d36653653..30294265d45f35ca86c0c3058967dce876370bff 100644 (file)
--- a/src/lib/server/cf_parse.c
+++ b/src/lib/server/cf_parse.c
@@ -229,7 +229,7 @@ int cf_pair_parse_value(TALLOC_CTX *ctx, void *out, UNUSED void *base, CONF_ITEM
                                        };
                fr_sbuff_t              sbuff = FR_SBUFF_IN(cp->value, strlen(cp->value));
 
-               rules.attr.list_def = PAIR_LIST_REQUEST;
+               rules.attr.list_def = request_attr_request;
                /*
                 *      Parse the cast operator for barewords
                 */
@@ -1221,7 +1221,7 @@ int cf_section_parse_pass2(void *base, CONF_SECTION *cs)
                                             &(tmpl_rules_t) {
                                                     .attr = {
                                                             .dict_def = dict,
-                                                            .list_def = PAIR_LIST_REQUEST,
+                                                            .list_def = request_attr_request,
                                                             .allow_unknown = false,
                                                             .allow_unresolved = false,
                                                             .allow_foreign = (dict == NULL)

diff --git a/src/lib/server/map.c b/src/lib/server/map.c
index bfc4378628080f07fcf78e3dddf1e4f05f52bfe7..1e174fae62fea0c66a8edb165690654c9b621ddc 100644 (file)
--- a/src/lib/server/map.c
+++ b/src/lib/server/map.c
@@ -1364,7 +1364,7 @@ static int map_exec_to_vp(TALLOC_CTX *ctx, fr_pair_list_t *out, request_t *reque
        /*
         *      We always put the request pairs into the environment
         */
-       input_pairs = tmpl_list_head(request, PAIR_LIST_REQUEST);
+       input_pairs = tmpl_list_head(request, request_attr_request);
 
        /*
         *      Automagically switch output type depending on our destination
@@ -1768,7 +1768,7 @@ int map_to_request(request_t *request, map_t const *map, radius_map_getvalue_t f
                                           &(tmpl_rules_t){
                                                .attr = {
                                                        .dict_def = request->dict,
-                                                       .list_def = PAIR_LIST_REQUEST,
+                                                       .list_def = request_attr_request,
                                                        .prefix = TMPL_ATTR_REF_PREFIX_NO
                                                }
                                           });

diff --git a/src/lib/server/map_async.c b/src/lib/server/map_async.c
index 78e026c8d01f088899d1746fb1647c0b80fc4568..1dad56bf1e0a0e1f3b7b9175d6539acbbf7bfc8e 100644 (file)
--- a/src/lib/server/map_async.c
+++ b/src/lib/server/map_async.c
@@ -321,7 +321,7 @@ int map_to_list_mod(TALLOC_CTX *ctx, vp_list_mod_t **out,
                                           &(tmpl_rules_t){
                                                .attr = {
                                                        .dict_def = request->dict,
-                                                       .list_def = PAIR_LIST_REQUEST,
+                                                       .list_def = request_attr_request,
                                                        .prefix = TMPL_ATTR_REF_PREFIX_NO
                                                }
                                           });

diff --git a/src/lib/server/tmpl.h b/src/lib/server/tmpl.h
index c3fbb9d6a7b9620be6c0a146384cdf0b70c0334b..4a9e3aa3e5ec1e8cdad640a542f825b70325c5a6 100644 (file)
--- a/src/lib/server/tmpl.h
+++ b/src/lib/server/tmpl.h
@@ -81,12 +81,6 @@ extern "C" {
  */
 #define TMPL_MAX_REQUEST_REF_NESTING   10
 
-#define PAIR_LIST_UNKNOWN NULL
-#define PAIR_LIST_REQUEST request_attr_request
-#define PAIR_LIST_REPLY request_attr_reply
-#define PAIR_LIST_CONTROL request_attr_control
-#define PAIR_LIST_STATE request_attr_state
-
 extern fr_table_num_ordered_t const pair_list_table[];
 extern size_t pair_list_table_len;
 
@@ -972,7 +966,7 @@ void tmpl_verify(char const *file, int line, tmpl_t const *vpt);
    fr_pair_list_t *head;
    fr_value_box_t value;
 
-   tmpl_pair_list_and_ctx(ctx, head, request, CURRENT_REQUEST, PAIR_LIST_REQUEST);
+   tmpl_pair_list_and_ctx(ctx, head, request, CURRENT_REQUEST, request_attr_request);
    if (!list) return -1; // error
 
    value.strvalue = talloc_typed_strdup(NULL, "my new username");

diff --git a/src/lib/server/tmpl_dcursor_tests.c b/src/lib/server/tmpl_dcursor_tests.c
index 997880993651984cabb40a4e9dda90ef79b51674..307441936406137e28ea4a7e2399cdb25c4a304f 100644 (file)
--- a/src/lib/server/tmpl_dcursor_tests.c
+++ b/src/lib/server/tmpl_dcursor_tests.c
@@ -136,7 +136,7 @@ int _tmpl_setup_and_cursor_init(fr_pair_t **vp_out, tmpl_dcursor_vars_t *vars, r
        tmpl_afrom_attr_substr(autofree, NULL, &vars->vpt, &FR_SBUFF_IN(ref, strlen(ref)), NULL, &(tmpl_rules_t){
                        .attr = {
                                .dict_def = test_dict,
-                               .list_def = PAIR_LIST_REQUEST,
+                               .list_def = request_attr_request,
                        }});
        TEST_CHECK(vars->vpt!= NULL);
        TEST_MSG("Failed creating tmpl from %s: %s", ref, fr_strerror());
@@ -164,7 +164,7 @@ int _tmpl_setup_and_cursor_build_init(fr_pair_t **vp_out, tmpl_dcursor_vars_t *v
        tmpl_afrom_attr_substr(autofree, NULL, &vars->vpt, &FR_SBUFF_IN(ref, strlen(ref)), NULL, &(tmpl_rules_t){
                        .attr = {
                                .dict_def = test_dict,
-                               .list_def = PAIR_LIST_REQUEST,
+                               .list_def = request_attr_request,
                        }});
        TEST_CHECK(vars->vpt!= NULL);
        TEST_MSG("Failed creating tmpl from %s: %s", ref, fr_strerror());

diff --git a/src/lib/server/tmpl_eval.c b/src/lib/server/tmpl_eval.c
index 5456b59383207eaffda3aa5e393788d384482a49..99c59c9dcd6ac31b03d44e793e8ed572333e0409 100644 (file)
--- a/src/lib/server/tmpl_eval.c
+++ b/src/lib/server/tmpl_eval.c
@@ -103,19 +103,19 @@ fr_pair_list_t *tmpl_list_head(request_t *request, fr_dict_attr_t const *list)
 {
        if (!request) return NULL;
 
-       if (list == PAIR_LIST_REQUEST) {
+       if (list == request_attr_request) {
                if (!request->packet) return NULL;
                return &request->request_pairs;
        }
 
-       if (list == PAIR_LIST_REPLY) {
+       if (list == request_attr_reply) {
                if (!request->reply) return NULL;
                return &request->reply_pairs;
        }
 
-       if (list == PAIR_LIST_CONTROL) return &request->control_pairs;
+       if (list == request_attr_control) return &request->control_pairs;
 
-       if (list == PAIR_LIST_STATE) return &request->session_state_pairs;
+       if (list == request_attr_state) return &request->session_state_pairs;
 
        RWDEBUG2("List \"%s\" is not available", tmpl_list_name(list, "<INVALID>"));
 
@@ -141,13 +141,13 @@ TALLOC_CTX *tmpl_list_ctx(request_t *request, fr_dict_attr_t const *list)
 {
        if (!request) return NULL;
 
-       if (list == PAIR_LIST_REQUEST) return request->request_ctx;
+       if (list == request_attr_request) return request->request_ctx;
 
-       if (list == PAIR_LIST_REPLY) return request->reply_ctx;
+       if (list == request_attr_reply) return request->reply_ctx;
 
-       if (list == PAIR_LIST_CONTROL) return request->control_ctx;
+       if (list == request_attr_control) return request->control_ctx;
 
-       if (list == PAIR_LIST_STATE) return request->session_state_ctx;
+       if (list == request_attr_state) return request->session_state_ctx;
 
        return NULL;
 }
@@ -167,9 +167,9 @@ TALLOC_CTX *tmpl_list_ctx(request_t *request, fr_dict_attr_t const *list)
  */
 fr_radius_packet_t *tmpl_packet_ptr(request_t *request, fr_dict_attr_t const *list)
 {
-       if (list == PAIR_LIST_REQUEST) return request->packet;
+       if (list == request_attr_request) return request->packet;
 
-       if (list == PAIR_LIST_REPLY) return request->reply;
+       if (list == request_attr_reply) return request->reply;
 
        return NULL;
 }

diff --git a/src/lib/server/tmpl_tokenize.c b/src/lib/server/tmpl_tokenize.c
index 6c48f978adcf037b55c36f14da8376aa45b304b4..a6a26e84195d48a214f6edce452a3c351eb4b617 100644 (file)
--- a/src/lib/server/tmpl_tokenize.c
+++ b/src/lib/server/tmpl_tokenize.c
@@ -95,7 +95,7 @@ TMPL_REQUEST_REF_DEF(tmpl_request_def_parent, REQUEST_PARENT);
  *
  * Defaults are used if a NULL rules pointer is passed to the parsing function.
  */
-#define DEFAULT_RULES tmpl_rules_t const default_rules = { .attr = { .list_def = PAIR_LIST_REQUEST }}
+#define DEFAULT_RULES tmpl_rules_t const default_rules = { .attr = { .list_def = request_attr_request }}
 
 
 /* clang-format off */
@@ -416,10 +416,6 @@ fr_slen_t tmpl_attr_list_from_substr(fr_dict_attr_t const **da_p, fr_sbuff_t *in
  * for that list to out. This value may be passed to #tmpl_pair_list, along with the current
  * #request_t, to get a pointer to the actual list in the #request_t.
  *
- * If we're sure we've definitely found a list qualifier token delimiter (``:``) but the
- * string doesn't match a #tmpl_pair_list qualifier, return 0 and write #PAIR_LIST_UNKNOWN
- * to out.
- *
  * If we can't find a string that looks like a request qualifier, set out to def, and
  * return 0.
  *
@@ -2159,7 +2155,7 @@ ssize_t tmpl_afrom_attr_substr(TALLOC_CTX *ctx, tmpl_attr_error_t *err,
                        .ar_parent = fr_dict_root(fr_dict_internal())
                };
 
-               fr_assert(at_rules->list_def != PAIR_LIST_UNKNOWN);
+               fr_assert(at_rules->list_def);
                ar->ar_da = at_rules->list_def;
 
                /*

diff --git a/src/lib/server/users_file.c b/src/lib/server/users_file.c
index 176fedf0f0915915b71754ea45abab345618ed53..321f19b316a561e213fc125a4edc552364b79f91 100644 (file)
--- a/src/lib/server/users_file.c
+++ b/src/lib/server/users_file.c
@@ -272,7 +272,7 @@ int pairlist_read(TALLOC_CTX *ctx, fr_dict_t const *dict, char const *file, PAIR
                .attr = {
                        .dict_def = dict,
                        .prefix = TMPL_ATTR_REF_PREFIX_NO,
-                       .list_def = PAIR_LIST_REQUEST,
+                       .list_def = request_attr_request,
                        .disallow_qualifiers = true, /* for now, until more tests are made */
 
                        /*
@@ -289,7 +289,7 @@ int pairlist_read(TALLOC_CTX *ctx, fr_dict_t const *dict, char const *file, PAIR
                .attr = {
                        .dict_def = dict,
                        .prefix = TMPL_ATTR_REF_PREFIX_YES,
-                       .list_def = PAIR_LIST_REQUEST,
+                       .list_def = request_attr_request,
                        .disallow_qualifiers = true, /* for now, until rlm_files supports it */
                }
        };
@@ -385,7 +385,7 @@ int pairlist_read(TALLOC_CTX *ctx, fr_dict_t const *dict, char const *file, PAIR
                }
                t->name = q;
 
-               lhs_rules.attr.list_def = PAIR_LIST_CONTROL;
+               lhs_rules.attr.list_def = request_attr_control;
                comma = false;
 
 check_item:
@@ -428,7 +428,7 @@ check_item:
                         *      for regexes we want to look at the
                         *      request list.
                         */
-                       tmpl_attr_set_list(new_map->lhs, PAIR_LIST_REQUEST);
+                       tmpl_attr_set_list(new_map->lhs, request_attr_request);
 
                        if (tmpl_is_regex_uncompiled(new_map->rhs) &&
                            (tmpl_regex_compile(new_map->rhs, false) < 0)) {
@@ -516,7 +516,7 @@ setup_reply:
                /*
                 *      Setup the reply items.
                 */
-               lhs_rules.attr.list_def = PAIR_LIST_REPLY;
+               lhs_rules.attr.list_def = request_attr_reply;
                comma = false;
 
 reply_item:
@@ -598,7 +598,7 @@ next_reply_item:
                        }
                }
 
-               fr_assert(tmpl_list(new_map->lhs) == PAIR_LIST_REPLY);
+               fr_assert(tmpl_list(new_map->lhs) == request_attr_reply);
 
                if (!new_map->parent) map_list_insert_tail(&t->reply, new_map);
 

diff --git a/src/lib/server/virtual_servers.c b/src/lib/server/virtual_servers.c
index bb7a0fedf2612f15859f490441fb2daafc54364f..4bd66ba0eb927cc51b61ec77015817fadd4d9f5c 100644 (file)
--- a/src/lib/server/virtual_servers.c
+++ b/src/lib/server/virtual_servers.c
@@ -1227,7 +1227,7 @@ int virtual_servers_instantiate(void)
                        tmpl_rules_t            parse_rules = {
                                .attr = {
                                        .dict_def = *(process->dict),
-                                       .list_def = PAIR_LIST_REQUEST,
+                                       .list_def = request_attr_request,
                                },
                        };
 

diff --git a/src/lib/unlang/compile.c b/src/lib/unlang/compile.c
index 42394d6ae1a9ec883731cc0b69161edaa4c63c48..f673cb355384a011699c3068858e61033778e18c 100644 (file)
--- a/src/lib/unlang/compile.c
+++ b/src/lib/unlang/compile.c
@@ -440,7 +440,7 @@ static bool pass2_fixup_cond_map(fr_cond_t *c, CONF_ITEM *ci, fr_dict_t const *d
                                         NULL,
                                         &(tmpl_rules_t){
                                                .attr = {
-                                                       .list_def = PAIR_LIST_REQUEST,
+                                                       .list_def = request_attr_request,
                                                        .allow_unknown = true
                                                }
                                         });
@@ -496,7 +496,7 @@ static bool pass2_fixup_cond_map(fr_cond_t *c, CONF_ITEM *ci, fr_dict_t const *d
         */
        if (!tmpl_is_attr(map->lhs) ||
            !tmpl_request_ref_is_current(tmpl_request(map->lhs)) ||
-           (tmpl_list(map->lhs) != PAIR_LIST_REQUEST)) {
+           (tmpl_list(map->lhs) != request_attr_request)) {
                return true;
        }
 
@@ -2698,7 +2698,7 @@ static unlang_t *compile_section(unlang_t *parent, unlang_compile_t *unlang_ctx,
        char const      *name1, *name2;
 
        fr_assert(unlang_ctx->rules != NULL);
-       fr_assert(unlang_ctx->rules->attr.list_def != PAIR_LIST_UNKNOWN);
+       fr_assert(unlang_ctx->rules->attr.list_def);
        /*
         *      We always create a group, even if the section is empty.
         */
@@ -3661,7 +3661,7 @@ static unlang_t *compile_if_subsection(unlang_t *parent, unlang_compile_t *unlan
                tmpl_rules_t t_rules = (tmpl_rules_t) {
                        .attr = {
                                .dict_def = xr_rules.tr_rules->dict_def,
-                               .list_def = PAIR_LIST_REQUEST,
+                               .list_def = request_attr_request,
                                .allow_unresolved = true,
                                .allow_unknown = true
                        }

diff --git a/src/lib/unlang/edit.c b/src/lib/unlang/edit.c
index 76d32faaf43d34d4675bfee507d8392b056385c5..be4bddc9c04ebe909583e4cb57b0fbf3bba4abe7 100644 (file)
--- a/src/lib/unlang/edit.c
+++ b/src/lib/unlang/edit.c
@@ -113,7 +113,7 @@ static int tmpl_attr_from_result(TALLOC_CTX *ctx, map_t const *map, edit_result_
                                   &(tmpl_rules_t){
                                        .attr = {
                                                .dict_def = request->dict,
-                                               .list_def = PAIR_LIST_REQUEST,
+                                               .list_def = request_attr_request,
                                                .prefix = TMPL_ATTR_REF_PREFIX_NO
                                        }
                                   });

diff --git a/src/lib/unlang/xlat_builtin.c b/src/lib/unlang/xlat_builtin.c
index 9db0b3fd0ed21d54a321ef879bf839de366eefa3..0e20e8b46fff362d7104bcba00423b44e45d9666 100644 (file)
--- a/src/lib/unlang/xlat_builtin.c
+++ b/src/lib/unlang/xlat_builtin.c
@@ -79,7 +79,7 @@ int xlat_fmt_get_vp(fr_pair_t **out, request_t *request, char const *name)
                                &(tmpl_rules_t){
                                        .attr = {
                                                .dict_def = request->dict,
-                                               .list_def = PAIR_LIST_REQUEST,
+                                               .list_def = request_attr_request,
                                                .prefix = TMPL_ATTR_REF_PREFIX_AUTO
                                        }
                                }) <= 0) return -4;
@@ -1153,7 +1153,7 @@ static xlat_action_t xlat_func_debug_attr(UNUSED TALLOC_CTX *ctx, UNUSED fr_dcur
                                &(tmpl_rules_t){
                                        .attr = {
                                                .dict_def = request->dict,
-                                               .list_def = PAIR_LIST_REQUEST,
+                                               .list_def = request_attr_request,
                                                .allow_wildcard = true,
                                                .prefix = TMPL_ATTR_REF_PREFIX_AUTO
                                        }
@@ -1203,7 +1203,7 @@ static xlat_action_t xlat_func_flatten(UNUSED TALLOC_CTX *ctx, UNUSED fr_dcursor
                                &(tmpl_rules_t){
                                        .attr = {
                                                .dict_def = request->dict,
-                                               .list_def = PAIR_LIST_REQUEST,
+                                               .list_def = request_attr_request,
                                                .prefix = TMPL_ATTR_REF_PREFIX_AUTO
                                        }
                                }) <= 0) {
@@ -1250,7 +1250,7 @@ static xlat_action_t xlat_func_unflatten(UNUSED TALLOC_CTX *ctx, UNUSED fr_dcurs
                                &(tmpl_rules_t){
                                        .attr = {
                                                .dict_def = request->dict,
-                                               .list_def = PAIR_LIST_REQUEST,
+                                               .list_def = request_attr_request,
                                                .prefix = TMPL_ATTR_REF_PREFIX_AUTO
                                        }
                                }) <= 0) {
@@ -1544,7 +1544,7 @@ static xlat_action_t xlat_func_map(TALLOC_CTX *ctx, fr_dcursor_t *out,
        tmpl_rules_t    attr_rules = {
                .attr = {
                        .dict_def = request->dict,
-                       .list_def = PAIR_LIST_REQUEST,
+                       .list_def = request_attr_request,
                        .prefix = TMPL_ATTR_REF_PREFIX_AUTO
                }
        };
@@ -1756,7 +1756,7 @@ static xlat_action_t xlat_func_eval(TALLOC_CTX *ctx, fr_dcursor_t *out,
                                    &(tmpl_rules_t){
                                            .attr = {
                                                .dict_def = request->dict,
-                                               .list_def = PAIR_LIST_REQUEST,
+                                               .list_def = request_attr_request,
                                                .allow_unknown = false,
                                                .allow_unresolved = false,
                                                .allow_foreign = false,
@@ -1833,7 +1833,7 @@ static xlat_action_t xlat_func_expr(TALLOC_CTX *ctx, fr_dcursor_t *out,
                                    &(tmpl_rules_t){
                                        .attr = {
                                                .dict_def = request->dict,
-                                               .list_def = PAIR_LIST_REQUEST,
+                                               .list_def = request_attr_request,
                                                .allow_unknown = false,
                                                .allow_unresolved = false,
                                                .allow_foreign = false,
@@ -2750,7 +2750,7 @@ static xlat_action_t xlat_func_pairs(TALLOC_CTX *ctx, fr_dcursor_t *out,
                                &(tmpl_rules_t){
                                        .attr = {
                                                .dict_def = request->dict,
-                                               .list_def = PAIR_LIST_REQUEST,
+                                               .list_def = request_attr_request,
                                                .allow_wildcard = true,
                                                .prefix = TMPL_ATTR_REF_PREFIX_AUTO
                                        }
@@ -3909,7 +3909,7 @@ static xlat_action_t protocol_encode_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
                                &(tmpl_rules_t){
                                        .attr = {
                                                .dict_def = request->dict,
-                                               .list_def = PAIR_LIST_REQUEST,
+                                               .list_def = request_attr_request,
                                                .allow_wildcard = true,
                                                .prefix = TMPL_ATTR_REF_PREFIX_AUTO
                                        }

diff --git a/src/lib/unlang/xlat_eval.c b/src/lib/unlang/xlat_eval.c
index 11370154b8fd60c53fde3dda9983f3432f7e18b2..a73324a846aeb664b063bfe057ed993c6346351f 100644 (file)
--- a/src/lib/unlang/xlat_eval.c
+++ b/src/lib/unlang/xlat_eval.c
@@ -1460,7 +1460,7 @@ ssize_t _xlat_eval(TALLOC_CTX *ctx, char **out, size_t outlen, request_t *reques
                                      &(tmpl_rules_t){
                                        .attr = {
                                                .dict_def = request->dict,
-                                               .list_def = PAIR_LIST_REQUEST,
+                                               .list_def = request_attr_request,
                                        }
                                      });
        if (len == 0) {

diff --git a/src/lib/unlang/xlat_expr.c b/src/lib/unlang/xlat_expr.c
index aee7c8800c9a7572be9a8c0287407f8c767429e5..aa57a30119a6eb2af975369cb86cd8d3a383741e 100644 (file)
--- a/src/lib/unlang/xlat_expr.c
+++ b/src/lib/unlang/xlat_expr.c
@@ -1560,7 +1560,7 @@ static xlat_action_t xlat_exists_resume(TALLOC_CTX *ctx, fr_dcursor_t *out,
                                           .attr = {
                                                   .dict_def = request->dict,
                                                   .request_def = &tmpl_request_def_current,
-                                                  .list_def = PAIR_LIST_REQUEST,
+                                                  .list_def = request_attr_request,
                                                   .prefix = TMPL_ATTR_REF_PREFIX_AUTO,
                                                   .allow_unknown = false,
                                                   .allow_unresolved = false,

diff --git a/src/lib/unlang/xlat_tokenize.c b/src/lib/unlang/xlat_tokenize.c
index 455bfe18f259e4ffc34ab200724b9abe54cc5e01..40b968dd4547bedbc3c6f1d106484b80e0e04757 100644 (file)
--- a/src/lib/unlang/xlat_tokenize.c
+++ b/src/lib/unlang/xlat_tokenize.c
@@ -2005,7 +2005,7 @@ int xlat_from_tmpl_attr(TALLOC_CTX *ctx, xlat_exp_head_t **out, tmpl_t **vpt_p)
         *      see if it's actually a virtual attribute.
         */
        if ((tmpl_attr_num_elements(vpt) == 1) ||
-           (((tmpl_attr_list_head(tmpl_attr(vpt))->da) == PAIR_LIST_REQUEST) && tmpl_attr_num_elements(vpt) == 2)){
+           (((tmpl_attr_list_head(tmpl_attr(vpt))->da) == request_attr_request) && tmpl_attr_num_elements(vpt) == 2)){
                if (tmpl_is_attr(vpt) && tmpl_attr_tail_da(vpt)->flags.virtual) {
                        func = xlat_func_find(tmpl_attr_tail_da(vpt)->name, -1);
                        if (!func) {

diff --git a/src/listen/ldap_sync/proto_ldap_sync.c b/src/listen/ldap_sync/proto_ldap_sync.c
index f1a439c4a8417bfc351e37c671bde1a6e4c41355..96e0b78845029174b96237eeed5327c139f90032 100644 (file)
--- a/src/listen/ldap_sync/proto_ldap_sync.c
+++ b/src/listen/ldap_sync/proto_ldap_sync.c
@@ -286,7 +286,7 @@ static int mod_instantiate(module_inst_ctx_t const *mctx)
                /* Strict rules for the update map as it's processed with limited functionality */
                .attr = {
                        .dict_def = dict_ldap_sync,
-                       .list_def = PAIR_LIST_REQUEST,
+                       .list_def = request_attr_request,
                        .allow_foreign = false,
                        .allow_unknown = false,
                        .allow_unresolved = false,

diff --git a/src/modules/rlm_cache/rlm_cache.c b/src/modules/rlm_cache/rlm_cache.c
index 8eb0d04dedbc3922020f6720ed14f5ba4b556f98..2a7e020a2168e095b092b299fdd948a2de1d149f 100644 (file)
--- a/src/modules/rlm_cache/rlm_cache.c
+++ b/src/modules/rlm_cache/rlm_cache.c
@@ -841,7 +841,7 @@ xlat_action_t cache_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
                                      &(tmpl_rules_t){
                                        .attr = {
                                                .dict_def = request->dict,
-                                               .list_def = PAIR_LIST_REQUEST,
+                                               .list_def = request_attr_request,
                                                .prefix = TMPL_ATTR_REF_PREFIX_AUTO
                                        }
                                      });
@@ -1010,7 +1010,7 @@ static int mod_instantiate(module_inst_ctx_t const *mctx)
        {
                tmpl_rules_t    parse_rules = {
                        .attr = {
-                               .list_def = PAIR_LIST_REQUEST,
+                               .list_def = request_attr_request,
                                .allow_wildcard = true,
                                .allow_foreign = true   /* Because we don't know where we'll be called */
                        }

diff --git a/src/modules/rlm_couchbase/rlm_couchbase.c b/src/modules/rlm_couchbase/rlm_couchbase.c
index b5e3ec5124607a6bb317f6fd0d4dcf91fb575a95..5b2b567e716b603a09dc3cb0935817106fb9201a 100644 (file)
--- a/src/modules/rlm_couchbase/rlm_couchbase.c
+++ b/src/modules/rlm_couchbase/rlm_couchbase.c
@@ -158,10 +158,10 @@ static unlang_action_t mod_authorize(rlm_rcode_t *p_result, module_ctx_t const *
                /*
                 *      Convert JSON data into maps
                 */
-               if ((mod_json_object_to_map(pool, &maps, request, cookie->jobj, PAIR_LIST_CONTROL) < 0) ||
-                   (mod_json_object_to_map(pool, &maps, request, cookie->jobj, PAIR_LIST_REPLY) < 0) ||
-                   (mod_json_object_to_map(pool, &maps, request, cookie->jobj, PAIR_LIST_REQUEST) < 0) ||
-                   (mod_json_object_to_map(pool, &maps, request, cookie->jobj, PAIR_LIST_STATE) < 0)) {
+               if ((mod_json_object_to_map(pool, &maps, request, cookie->jobj, request_attr_control) < 0) ||
+                   (mod_json_object_to_map(pool, &maps, request, cookie->jobj, request_attr_reply) < 0) ||
+                   (mod_json_object_to_map(pool, &maps, request, cookie->jobj, request_attr_request) < 0) ||
+                   (mod_json_object_to_map(pool, &maps, request, cookie->jobj, request_attr_state) < 0)) {
                invalid:
                        talloc_free(pool);
                        rcode = RLM_MODULE_INVALID;

diff --git a/src/modules/rlm_exec/rlm_exec.c b/src/modules/rlm_exec/rlm_exec.c
index 849220d074e95116b89c2b98d69cf72191b1afce..10dc2480c885590d5c0c6de9def7d0d749eadd2f 100644 (file)
--- a/src/modules/rlm_exec/rlm_exec.c
+++ b/src/modules/rlm_exec/rlm_exec.c
@@ -171,8 +171,8 @@ static int mod_bootstrap(module_inst_ctx_t const *mctx)
 
        if (inst->input) {
                p = inst->input;
-               p += tmpl_pair_list_name(&inst->input_list, p, PAIR_LIST_UNKNOWN);
-               if ((inst->input_list == PAIR_LIST_UNKNOWN) || (*p != '\0')) {
+               p += tmpl_pair_list_name(&inst->input_list, p, NULL);
+               if (!inst->input_list || (*p != '\0')) {
                        cf_log_err(conf, "Invalid input list '%s'", inst->input);
                        return -1;
                }
@@ -180,8 +180,8 @@ static int mod_bootstrap(module_inst_ctx_t const *mctx)
 
        if (inst->output) {
                p = inst->output;
-               p += tmpl_pair_list_name(&inst->output_list, p, PAIR_LIST_UNKNOWN);
-               if ((inst->output_list == PAIR_LIST_UNKNOWN) || (*p != '\0')) {
+               p += tmpl_pair_list_name(&inst->output_list, p, NULL);
+               if (!inst->output_list || (*p != '\0')) {
                        cf_log_err(conf, "Invalid output list '%s'", inst->output);
                        return -1;
                }
@@ -246,7 +246,7 @@ static int mod_instantiate(module_inst_ctx_t const *mctx)
                                 T_BACK_QUOTED_STRING, NULL,
                                 &(tmpl_rules_t) {
                                        .attr = {
-                                               .list_def = PAIR_LIST_REQUEST,
+                                               .list_def = request_attr_request,
                                                .allow_foreign = true,
                                                .allow_unresolved = false,
                                                .allow_unknown = false

diff --git a/src/modules/rlm_files/rlm_files.c b/src/modules/rlm_files/rlm_files.c
index 27d6a1f37bd10f17b510fc2a595b8ac142b47694..c7f27936939fce73bc83c4c871dd0a2f1ae19540 100644 (file)
--- a/src/modules/rlm_files/rlm_files.c
+++ b/src/modules/rlm_files/rlm_files.c
@@ -229,7 +229,7 @@ static int getusersfile(TALLOC_CTX *ctx, char const *filename, fr_htrie_t **ptre
                         *      assertion that they do not get out of
                         *      sync.
                         */
-                       fr_assert(tmpl_list(map->lhs) == PAIR_LIST_REPLY);
+                       fr_assert(tmpl_list(map->lhs) == request_attr_reply);
                }
        }
 

diff --git a/src/modules/rlm_json/rlm_json.c b/src/modules/rlm_json/rlm_json.c
index 2f13d33ec7db3960a8016fee6c53f4bf2e271445..b7b38c080341838829e60d0eb7e3e931e6692981 100644 (file)
--- a/src/modules/rlm_json/rlm_json.c
+++ b/src/modules/rlm_json/rlm_json.c
@@ -200,7 +200,7 @@ static xlat_action_t json_encode_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out,
                                              &json_arg_parse_rules,
                                              &(tmpl_rules_t){
                                                .attr = {
-                                                       .list_def = PAIR_LIST_REQUEST,
+                                                       .list_def = request_attr_request,
                                                        .allow_wildcard = true,
                                                        .dict_def = request->dict
                                                }

diff --git a/src/modules/rlm_ldap/groups.c b/src/modules/rlm_ldap/groups.c
index f5500cfa8776fd668cb007081e0c9447574b2195..1fe8f4c6c7310d614369f76050a3a4bd8ccad1a8 100644 (file)
--- a/src/modules/rlm_ldap/groups.c
+++ b/src/modules/rlm_ldap/groups.c
@@ -312,8 +312,8 @@ unlang_action_t rlm_ldap_cacheable_userobj(rlm_rcode_t *p_result, rlm_ldap_t con
        }
        count = ldap_count_values_len(values);
 
-       list = tmpl_list_head(request, PAIR_LIST_CONTROL);
-       list_ctx = tmpl_list_ctx(request, PAIR_LIST_CONTROL);
+       list = tmpl_list_head(request, request_attr_control);
+       list_ctx = tmpl_list_ctx(request, request_attr_control);
        fr_assert(list != NULL);
        fr_assert(list_ctx != NULL);
 

diff --git a/src/modules/rlm_ldap/rlm_ldap.c b/src/modules/rlm_ldap/rlm_ldap.c
index 03fa4c6f108ca3257a4f31ce97d421c25006d549..a5fd0991ba3bc29108c882cd018e08b34f8069f8 100644 (file)
--- a/src/modules/rlm_ldap/rlm_ldap.c
+++ b/src/modules/rlm_ldap/rlm_ldap.c
@@ -1999,7 +1999,7 @@ static int mod_instantiate(module_inst_ctx_t const *mctx)
        {
                tmpl_rules_t    parse_rules = {
                        .attr = {
-                               .list_def = PAIR_LIST_REQUEST,
+                               .list_def = request_attr_request,
                                .allow_foreign = true   /* Because we don't know where we'll be called */
                        }
                };

diff --git a/src/modules/rlm_linelog/rlm_linelog.c b/src/modules/rlm_linelog/rlm_linelog.c
index be499a662ab0ba3f380c947986cc0339f598b0f9..8923eb22b02d5c5d8ef9667520028f48943f19c0 100644 (file)
--- a/src/modules/rlm_linelog/rlm_linelog.c
+++ b/src/modules/rlm_linelog/rlm_linelog.c
@@ -528,7 +528,7 @@ static unlang_action_t CC_HINT(nonnull) mod_do_linelog(rlm_rcode_t *p_result, mo
                                         NULL,
                                         &(tmpl_rules_t){
                                                .attr = {
-                                                       .list_def = PAIR_LIST_REQUEST,
+                                                       .list_def = request_attr_request,
                                                        .dict_def = request->dict,
                                                        .allow_unknown = true,
                                                        .allow_unresolved = false,

diff --git a/src/modules/rlm_lua/lua.c b/src/modules/rlm_lua/lua.c
index 076f872d89e87c2833a9f1f393bdbd1d2f3e5ec8..da6f24128b8a1ecc377bf21526b32a234908ec48 100644 (file)
--- a/src/modules/rlm_lua/lua.c
+++ b/src/modules/rlm_lua/lua.c
@@ -728,7 +728,7 @@ static void _lua_fr_request_register(lua_State *L, request_t *request)
                lua_setfield(L, -2, "pairs");
 
                lua_newtable(L);                /* Attribute list meta-table */
-               lua_pushinteger(L, PAIR_LIST_REQUEST);
+               lua_pushinteger(L, request_attr_request->attr);
                lua_pushcclosure(L, _lua_pair_accessor_init, 1);
                lua_setfield(L, -2, "__index");
                lua_setmetatable(L, -2);

diff --git a/src/modules/rlm_mruby/rlm_mruby.c b/src/modules/rlm_mruby/rlm_mruby.c
index 59d05c503d372f24e3cab6d73365afea30e4952b..856bd051c07f9c5b7e2e85acdf7f192933595897 100644 (file)
--- a/src/modules/rlm_mruby/rlm_mruby.c
+++ b/src/modules/rlm_mruby/rlm_mruby.c
@@ -362,7 +362,7 @@ static void add_vp_tuple(TALLOC_CTX *ctx, request_t *request, fr_pair_list_t *vp
                                        &(tmpl_rules_t){
                                                .attr = {
                                                        .dict_def = request->dict,
-                                                       .list_def = PAIR_LIST_REPLY
+                                                       .list_def = request_attr_reply
                                                }
                                        }) <= 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 4b289b17ad1717d89207574bf288745fe1579556..cada68df24beb122604ea41215b0cc72243d2bdf 100644 (file)
--- a/src/modules/rlm_python/rlm_python.c
+++ b/src/modules/rlm_python/rlm_python.c
@@ -311,7 +311,7 @@ static void mod_vptuple(TALLOC_CTX *ctx, module_ctx_t const *mctx, request_t *re
                                        &(tmpl_rules_t){
                                                .attr = {
                                                        .dict_def = request->dict,
-                                                       .list_def = PAIR_LIST_REPLY
+                                                       .list_def = request_attr_reply
                                                }
                                        }) <= 0) {
                        ERROR("%s - Failed to find attribute %s.%s", funcname, list_name, s1);

diff --git a/src/modules/rlm_rest/rest.c b/src/modules/rlm_rest/rest.c
index d038f0bbe9db4568d5e77a9fec1499e6cd42b08c..56b91cc0515aca52ed46daa33266456cc333dacd 100644 (file)
--- a/src/modules/rlm_rest/rest.c
+++ b/src/modules/rlm_rest/rest.c
@@ -743,7 +743,7 @@ static int rest_decode_post(UNUSED rlm_rest_t const *instance, UNUSED rlm_rest_s
                                                .attr = {
                                                        .prefix = TMPL_ATTR_REF_PREFIX_NO,
                                                        .dict_def = request->dict,
-                                                       .list_def = PAIR_LIST_REPLY
+                                                       .list_def = request_attr_reply
                                                }
                                        }) <= 0) {
                        RPWDEBUG("Failed parsing attribute (skipping)");
@@ -1034,7 +1034,7 @@ static int json_pair_alloc(rlm_rest_t const *instance, rlm_rest_section_t const
                                                        .attr = {
                                                                .prefix = TMPL_ATTR_REF_PREFIX_NO,
                                                                .dict_def = request->dict,
-                                                               .list_def = PAIR_LIST_REPLY
+                                                               .list_def = request_attr_reply
                                                        }
                                                }) <= 0) {
                                RPWDEBUG("Failed parsing attribute (skipping)");