s/tmpl_pair_list_t/fr_dict_attr_t const */

diff --git a/src/lib/server/map.c b/src/lib/server/map.c
index fe3c0b79edb4f5381ebb57ace6d8e9d65c16e8de..8dd853cd8a1d53bb4e5c425aa137f41e161da938 100644 (file)
--- a/src/lib/server/map.c
+++ b/src/lib/server/map.c
@@ -1735,7 +1735,7 @@ int map_to_request(request_t *request, map_t const *map, radius_map_getvalue_t f
 
        map_t                   exp_map;
        tmpl_t                  *exp_lhs;
-       tmpl_pair_list_t        list_ref;
+       fr_dict_attr_t const    *list_ref;
 
        tmpl_dcursor_ctx_t      cc = {};
 

diff --git a/src/lib/server/map_async.c b/src/lib/server/map_async.c
index 256a58f72554439274bb65206098f89062c27319..5e369107a585544d0db4e46f67aa72f142e22054 100644 (file)
--- a/src/lib/server/map_async.c
+++ b/src/lib/server/map_async.c
@@ -206,7 +206,7 @@ static inline fr_pair_list_t *map_check_src_or_dst(request_t *request, map_t con
 {
        request_t               *context = request;
        fr_pair_list_t          *list;
-       tmpl_pair_list_t        list_ref;
+       fr_dict_attr_t const    *list_ref;
 
        if (tmpl_request_ptr(&context, tmpl_request(src_dst)) < 0) {
                RPEDEBUG("Mapping \"%.*s\" -> \"%.*s\" cannot be performed",

diff --git a/src/lib/server/tmpl.h b/src/lib/server/tmpl.h
index bd83f28560ae2088da466fd82f3de98971185f26..4c44736e5a959c20d5f23308a1c7b22092666afd 100644 (file)
--- a/src/lib/server/tmpl.h
+++ b/src/lib/server/tmpl.h
@@ -301,7 +301,7 @@ struct tmpl_attr_rules_s {
                                                        ///< the stack and a pointer to it
                                                        ///< placed here.
 
-       tmpl_pair_list_t        list_def;               //!< Default list to use with unqualified
+       fr_dict_attr_t const    *list_def;              //!< Default list to use with unqualified
                                                        ///< attribute reference.
 
        tmpl_attr_prefix_t      prefix;                 //!< Whether the attribute reference requires
@@ -545,7 +545,7 @@ struct tmpl_s {
                                                                ///< with a '&'.
                        bool                    was_oid;        //!< Was originally a numeric OID.
 
-                       tmpl_pair_list_t        list;           //!< List to search or insert in.
+                       fr_dict_attr_t const    *list;          //!< List to search or insert in.
                                                                ///< deprecated.
 
                        FR_DLIST_HEAD(tmpl_request_list)        rr;     //!< Request to search or insert in.
@@ -814,7 +814,7 @@ static inline size_t tmpl_attr_num_elements(tmpl_t const *vpt)
        return tmpl_attr_list_num_elements(tmpl_attr(vpt));
 }
 
-static inline tmpl_pair_list_t tmpl_list(tmpl_t const *vpt)
+static inline fr_dict_attr_t const *tmpl_list(tmpl_t const *vpt)
 {
        tmpl_assert_type(tmpl_is_attr(vpt) ||
                         tmpl_is_attr_unresolved(vpt) ||                        /* Remove once list is part of ar dlist */
@@ -1014,15 +1014,15 @@ typedef enum {
 
 void                   tmpl_debug(tmpl_t const *vpt) CC_HINT(nonnull);
 
-fr_pair_list_t         *tmpl_list_head(request_t *request, tmpl_pair_list_t list);
+fr_pair_list_t         *tmpl_list_head(request_t *request, fr_dict_attr_t const *list);
 
-fr_radius_packet_t     *tmpl_packet_ptr(request_t *request, tmpl_pair_list_t list_name) CC_HINT(nonnull);
+fr_radius_packet_t     *tmpl_packet_ptr(request_t *request, fr_dict_attr_t const *list) CC_HINT(nonnull);
 
-TALLOC_CTX             *tmpl_list_ctx(request_t *request, tmpl_pair_list_t list_name);
+TALLOC_CTX             *tmpl_list_ctx(request_t *request, fr_dict_attr_t const *list);
 
-size_t                 tmpl_pair_list_name(tmpl_pair_list_t *out, char const *name, tmpl_pair_list_t default_list) CC_HINT(nonnull);
 fr_slen_t              tmpl_attr_list_from_substr(fr_dict_attr_t const **da_p, fr_sbuff_t *in) CC_HINT(nonnull);
 
+size_t                 tmpl_pair_list_name(fr_dict_attr_t const **out, char const *name, fr_dict_attr_t const *default_list) CC_HINT(nonnull(1,2));
 
 tmpl_t                 *tmpl_init_printf(tmpl_t *vpt, tmpl_type_t type, fr_token_t quote, char const *fmt, ...) CC_HINT(nonnull(1,4));
 
@@ -1132,7 +1132,7 @@ void                      tmpl_attr_rewrite_num(tmpl_t *vpt, int16_t from, int16_t to) CC_HINT(nonn
 
 void                   tmpl_attr_set_request_ref(tmpl_t *vpt, FR_DLIST_HEAD(tmpl_request_list) const *request_def) CC_HINT(nonnull);
 
-void                   tmpl_attr_set_list(tmpl_t *vpt, tmpl_pair_list_t list) CC_HINT(nonnull);
+void                   tmpl_attr_set_list(tmpl_t *vpt, fr_dict_attr_t const *list) CC_HINT(nonnull);
 
 int                    tmpl_attr_afrom_list(TALLOC_CTX *ctx, tmpl_t **out, tmpl_t const *list,
                                             fr_dict_attr_t const *da) CC_HINT(nonnull);

diff --git a/src/lib/server/tmpl_eval.c b/src/lib/server/tmpl_eval.c
index 6ef27deb4804294efcfead376ed4d866b97f97c5..e8d94ca29b404b28badd19f2ad5c0ae677651fef 100644 (file)
--- a/src/lib/server/tmpl_eval.c
+++ b/src/lib/server/tmpl_eval.c
@@ -96,7 +96,7 @@ static fr_dict_attr_autoload_t tmpl_dict_attr[] = {
  */
 fr_pair_t *tmpl_get_list(request_t *request, tmpl_t const *vpt)
 {
-       tmpl_pair_list_t list;
+       fr_dict_attr_t const *list;
 
        if (!request) return NULL;
 
@@ -138,7 +138,7 @@ fr_pair_t *tmpl_get_list(request_t *request, tmpl_t const *vpt)
  *
  * @see tmpl_dcursor_init
  */
-fr_pair_list_t *tmpl_list_head(request_t *request, tmpl_pair_list_t list)
+fr_pair_list_t *tmpl_list_head(request_t *request, fr_dict_attr_t const *list)
 {
        if (!request) return NULL;
 
@@ -176,7 +176,7 @@ fr_pair_list_t *tmpl_list_head(request_t *request, tmpl_pair_list_t list)
  *
  * @see tmpl_pair_list
  */
-TALLOC_CTX *tmpl_list_ctx(request_t *request, tmpl_pair_list_t list)
+TALLOC_CTX *tmpl_list_ctx(request_t *request, fr_dict_attr_t const *list)
 {
        if (!request) return NULL;
 
@@ -204,7 +204,7 @@ TALLOC_CTX *tmpl_list_ctx(request_t *request, tmpl_pair_list_t list)
  *
  * @see tmpl_pair_list
  */
-fr_radius_packet_t *tmpl_packet_ptr(request_t *request, tmpl_pair_list_t 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;
 

diff --git a/src/lib/server/tmpl_tokenize.c b/src/lib/server/tmpl_tokenize.c
index cc9775b21995fe0a546e06ce18193d2ddd04cad6..7c5a2465664cedbef52891b7133b42b6545e3121 100644 (file)
--- a/src/lib/server/tmpl_tokenize.c
+++ b/src/lib/server/tmpl_tokenize.c
@@ -439,7 +439,7 @@ fr_slen_t tmpl_attr_list_from_substr(fr_dict_attr_t const **da_p, fr_sbuff_t *in
  * @see pair_list
  * @see tmpl_pair_list
  */
-size_t tmpl_pair_list_name(tmpl_pair_list_t *out, char const *name, tmpl_pair_list_t def)
+size_t tmpl_pair_list_name(fr_dict_attr_t const **out, char const *name, fr_dict_attr_t const *def)
 {
        char const *p = name;
        char const *q;
@@ -1253,7 +1253,7 @@ void tmpl_attr_set_request_ref(tmpl_t *vpt, FR_DLIST_HEAD(tmpl_request_list) con
        TMPL_ATTR_VERIFY(vpt);
 }
 
-void tmpl_attr_set_list(tmpl_t *vpt, tmpl_pair_list_t list)
+void tmpl_attr_set_list(tmpl_t *vpt, fr_dict_attr_t const *list)
 {
        vpt->data.attribute.list = list;
 

diff --git a/src/modules/rlm_exec/rlm_exec.c b/src/modules/rlm_exec/rlm_exec.c
index 1d6feac49e936aa6f31c6ce959af325b6791b8c2..849220d074e95116b89c2b98d69cf72191b1afce 100644 (file)
--- a/src/modules/rlm_exec/rlm_exec.c
+++ b/src/modules/rlm_exec/rlm_exec.c
@@ -41,8 +41,8 @@ typedef struct {
        char const              *program;
        char const              *input;
        char const              *output;
-       tmpl_pair_list_t        input_list;
-       tmpl_pair_list_t        output_list;
+       fr_dict_attr_t const    *input_list;
+       fr_dict_attr_t const    *output_list;
        bool                    shell_escape;
        bool                    env_inherit;
        fr_time_delta_t         timeout;