s/fr_dict_enum_t/fr_dict_enum_value_t/

diff --git a/src/bin/radict.c b/src/bin/radict.c
index 51092db02f208a42e30e7942fc664b310d0b9320..3e198f44866e634f2d8ef51774df9fe1ace69549 100644 (file)
--- a/src/bin/radict.c
+++ b/src/bin/radict.c
@@ -141,7 +141,7 @@ static void da_print_info_td(fr_dict_t const *dict, fr_dict_attr_t const *da)
        char                    oid_str[512];
        char                    flags[256];
        fr_hash_iter_t          iter;
-       fr_dict_enum_t          *enumv;
+       fr_dict_enum_value_t            *enumv;
 
        (void)fr_dict_attr_oid_print(&FR_SBUFF_OUT(oid_str, sizeof(oid_str)), NULL, da, false);
 

diff --git a/src/bin/radsnmp.c b/src/bin/radsnmp.c
index f68d94ac6b9742eba47aa0125b0a4f4bcf5e1e98..da3d7e2ab8ab7edcf2dcbb2d73cb76a36e67c9a1 100644 (file)
--- a/src/bin/radsnmp.c
+++ b/src/bin/radsnmp.c
@@ -684,7 +684,7 @@ static int radsnmp_send_recv(radsnmp_conf_t *conf, int fd)
                        char            *value;
                        char            type_str[64];
                        char            *p;
-                       fr_dict_enum_t  *type;
+                       fr_dict_enum_value_t    *type;
 
                        NEXT_LINE(line, buffer);        /* Should be the OID */
                        NEXT_LINE(value, value_buff);   /* Should be the value */

diff --git a/src/bin/unit_test_module.c b/src/bin/unit_test_module.c
index 7c592408317e5ff5032314230f93c2b64edf58d7..67f9faa0cc197d6cabda2b4f3f57d20ec10903c1 100644 (file)
--- a/src/bin/unit_test_module.c
+++ b/src/bin/unit_test_module.c
@@ -297,7 +297,7 @@ static void print_packet(FILE *fp, fr_radius_packet_t *packet, fr_pair_list_t *l
 {
        fr_pair_t *vp;
        fr_dcursor_t cursor;
-       fr_dict_enum_t *dv;
+       fr_dict_enum_value_t *dv;
 
        if (fr_pair_list_empty(list)) {
                fprintf(fp, "\n");

diff --git a/src/lib/eap/types.c b/src/lib/eap/types.c
index 960902d9bbe2d4fa1b6232215b266844b854c5ae..693d0d2abe631885c0bbe2a406639b10b0b1a29d 100644 (file)
--- a/src/lib/eap/types.c
+++ b/src/lib/eap/types.c
@@ -35,7 +35,7 @@
  */
 eap_type_t eap_name2type(char const *name)
 {
-       fr_dict_enum_t  *dv;
+       fr_dict_enum_value_t    *dv;
 
        dv = fr_dict_enum_by_name(attr_eap_type, name, -1);
        if (!dv) return FR_EAP_METHOD_INVALID;
@@ -51,7 +51,7 @@ eap_type_t eap_name2type(char const *name)
  */
 char const *eap_type2name(eap_type_t method)
 {
-       fr_dict_enum_t  *dv;
+       fr_dict_enum_value_t    *dv;
 
        dv = fr_dict_enum_by_value(attr_eap_type, fr_box_uint32(method));
        if (dv) return dv->name;

diff --git a/src/lib/eap_aka_sim/xlat.c b/src/lib/eap_aka_sim/xlat.c
index 74a108b12a5ba22d2dbbd4cfec20c3d5af0d1a59..b905714335254d812d1121a2273132d22f5bb141 100644 (file)
--- a/src/lib/eap_aka_sim/xlat.c
+++ b/src/lib/eap_aka_sim/xlat.c
@@ -371,7 +371,7 @@ static xlat_action_t aka_sim_3gpp_temporary_id_encrypt_xlat(TALLOC_CTX *ctx, fr_
         *      Check for the optional type argument
         */
        if (!fr_type_is_null(type_vb->type)) {
-               fr_dict_enum_t const            *type_enum;
+               fr_dict_enum_value_t const              *type_enum;
 
                type_enum = fr_dict_enum_by_name(attr_eap_aka_sim_identity_type,
                                                 type_vb->vb_strvalue, type_vb->vb_length);

diff --git a/src/lib/json/json.c b/src/lib/json/json.c
index 31bad998a7909bd1f7d8afded6f2e2f2f29c67e2..dacd5466241fcfb43e651da74b2bb04c480eaec4 100644 (file)
--- a/src/lib/json/json.c
+++ b/src/lib/json/json.c
@@ -98,7 +98,7 @@ int fr_json_object_to_value_box(TALLOC_CTX *ctx, fr_value_box_t *out, json_objec
        {
                char const      *value;
                size_t          len;
-               fr_dict_enum_t  *found;
+               fr_dict_enum_value_t    *found;
 
                value = json_object_get_string(object);
                len = json_object_get_string_len(object);
@@ -196,7 +196,7 @@ json_object *json_object_from_value_box(TALLOC_CTX *ctx, fr_value_box_t const *d
         *      should be converted to string types.
         */
        if (data->enumv) {
-               fr_dict_enum_t *enumv;
+               fr_dict_enum_value_t *enumv;
 
                enumv = fr_dict_enum_by_value(data->enumv, data);
                if (enumv) return json_object_new_string(enumv->name);

diff --git a/src/lib/server/method.c b/src/lib/server/method.c
index edbc31b64f17763339f7f4aae1f67580b78cf95e..a806e54689e57d05816ff3225451de5b5ae1386c 100644 (file)
--- a/src/lib/server/method.c
+++ b/src/lib/server/method.c
@@ -56,7 +56,7 @@ fr_dict_attr_autoload_t module_method_attr[] = {
  */
 module_method_id_t module_method_define(module_method_id_t *id_out, char const *name)
 {
-       fr_dict_enum_t  *enumv;
+       fr_dict_enum_value_t    *enumv;
 
        fr_assert_msg(attr_module_method, "module method global init must be called first");
 
@@ -85,7 +85,7 @@ done:
  */
 char const *module_method_name_by_id(module_method_id_t id)
 {
-       fr_dict_enum_t *enumv = fr_dict_enum_by_value(attr_module_method, fr_box_uint32(id));
+       fr_dict_enum_value_t *enumv = fr_dict_enum_by_value(attr_module_method, fr_box_uint32(id));
 
        if (!enumv) return NULL;
 
@@ -101,7 +101,7 @@ char const *module_method_name_by_id(module_method_id_t id)
  */
 char const *module_method_name_by_entry(module_method_entry_t const *entry)
 {
-       fr_dict_enum_t *enumv = fr_dict_enum_by_value(attr_module_method, fr_box_uint32(entry->id));
+       fr_dict_enum_value_t *enumv = fr_dict_enum_by_value(attr_module_method, fr_box_uint32(entry->id));
 
        if (!enumv) return NULL;
 

diff --git a/src/lib/server/module.c b/src/lib/server/module.c
index 765a8321e1e16a5d466e4d644579dbacac914293..68f149b63c5e661e44c19b12c493ca8fc60d0b96 100644 (file)
--- a/src/lib/server/module.c
+++ b/src/lib/server/module.c
@@ -601,7 +601,7 @@ char const *module_state_method_to_str(module_state_func_table_t const *table,
  * @param[in] type_da          to use.  Usually attr_auth_type.
  * @param[in] enumv            Enumeration value of the specified type_da.
  */
-bool module_section_type_set(request_t *request, fr_dict_attr_t const *type_da, fr_dict_enum_t const *enumv)
+bool module_section_type_set(request_t *request, fr_dict_attr_t const *type_da, fr_dict_enum_value_t const *enumv)
 {
        fr_pair_t *vp;
 

diff --git a/src/lib/server/module.h b/src/lib/server/module.h
index ee6639ae20886d567ba372a2931f4d474fc9eb10..7aff0704dc8329c604709391e9383cccbe433ab8 100644 (file)
--- a/src/lib/server/module.h
+++ b/src/lib/server/module.h
@@ -300,7 +300,7 @@ module_method_t     module_state_str_to_method(module_state_func_table_t const *tabl
 char const     *module_state_method_to_str(module_state_func_table_t const *table,
                                            module_method_t method, char const *def);
 
-bool           module_section_type_set(request_t *request, fr_dict_attr_t const *type_da, fr_dict_enum_t const *enumv);
+bool           module_section_type_set(request_t *request, fr_dict_attr_t const *type_da, fr_dict_enum_value_t const *enumv);
 /** @} */
 
 /** @name Module and module thread lookup

diff --git a/src/lib/server/virtual_servers.c b/src/lib/server/virtual_servers.c
index b5ef5da84d2fbcae62ca2eb017e16626fe8f90e6..af242c3077fa7065445310a09d10b9829cca5c3f 100644 (file)
--- a/src/lib/server/virtual_servers.c
+++ b/src/lib/server/virtual_servers.c
@@ -560,7 +560,7 @@ int virtual_server_section_attribute_define(CONF_SECTION *server_cs, char const
 
        while ((subcs = cf_section_find_next(server_cs, subcs, subcs_name, CF_IDENT_ANY))) {
                char const      *name2;
-               fr_dict_enum_t  *dv;
+               fr_dict_enum_value_t    *dv;
 
                name2 = cf_section_name2(subcs);
                if (!name2) {
@@ -1236,7 +1236,7 @@ unlang_action_t process_authenticate(rlm_rcode_t *p_result, int auth_type, reque
        char const      *module;
        char const      *component;
        fr_dict_attr_t const *da;
-       fr_dict_enum_t const *dv;
+       fr_dict_enum_value_t const *dv;
        CONF_SECTION    *subcs;
        fr_dict_t const *dict_internal;
 

diff --git a/src/lib/unlang/call.c b/src/lib/unlang/call.c
index d8bc70ceb5123cf339d30aa71075a62dc6d4e0b9..30df6b76f5c3102b8fbdfa09ded6868cf782ede3 100644 (file)
--- a/src/lib/unlang/call.c
+++ b/src/lib/unlang/call.c
@@ -55,7 +55,7 @@ static unlang_action_t unlang_call_frame_init(rlm_rcode_t *p_result, request_t *
 {
        unlang_group_t                  *g;
        unlang_call_t                   *gext;
-       fr_dict_enum_t const            *type_enum;
+       fr_dict_enum_value_t const              *type_enum;
        fr_pair_t                       *packet_type_vp = NULL;
 
        /*

diff --git a/src/lib/unlang/compile.c b/src/lib/unlang/compile.c
index 97b6357e226fb2762b1bd8bd0e67d124b731f0a4..77c7824a91719feaa9270bd01afaea94a03547f8 100644 (file)
--- a/src/lib/unlang/compile.c
+++ b/src/lib/unlang/compile.c
@@ -3053,7 +3053,7 @@ static unlang_t *compile_subrequest(unlang_t *parent, unlang_compile_t *unlang_c
 
        fr_dict_t const                 *dict;
        fr_dict_attr_t const            *da = NULL;
-       fr_dict_enum_t const            *type_enum = NULL;
+       fr_dict_enum_value_t const              *type_enum = NULL;
 
        char const                      *packet_name = NULL;
        char                            *p, *namespace = NULL;

diff --git a/src/lib/unlang/subrequest.c b/src/lib/unlang/subrequest.c
index 89d0666303644baea6b29fc682e871155f0fd221..cecddac9d24371cbb7a37d5cd89167480fc726a5 100644 (file)
--- a/src/lib/unlang/subrequest.c
+++ b/src/lib/unlang/subrequest.c
@@ -162,7 +162,7 @@ static unlang_action_t unlang_subrequest_parent_init(rlm_rcode_t *p_result, requ
        if (gext->type_enum) {
                child->packet->code = vp->vp_uint32 = gext->type_enum->value->vb_uint32;
        } else {
-               fr_dict_enum_t const    *type_enum;
+               fr_dict_enum_value_t const      *type_enum;
                fr_pair_t               *attr;
 
                if (tmpl_find_vp(&attr, request, gext->vpt) < 0) {

diff --git a/src/lib/unlang/subrequest_priv.h b/src/lib/unlang/subrequest_priv.h
index 5327428bd08269b4ea45b56a4f6ba6f7d0d67da3..a01fe09aaecb05203bd48590e57640091130900d 100644 (file)
--- a/src/lib/unlang/subrequest_priv.h
+++ b/src/lib/unlang/subrequest_priv.h
@@ -41,7 +41,7 @@ typedef struct {
 
        fr_dict_t const         *dict;                  //!< Dictionary of the subrequest protocol.
        fr_dict_attr_t const    *attr_packet_type;      //!< Packet-type attribute in the subrequest protocol.
-       fr_dict_enum_t const    *type_enum;             //!< Static enumeration value for attr_packet_type
+       fr_dict_enum_value_t const      *type_enum;             //!< Static enumeration value for attr_packet_type
                                                        ///< if the packet-type is static.
 } unlang_subrequest_t;
 

diff --git a/src/lib/util/dict.h b/src/lib/util/dict.h
index 307cabc2f65dc1abfc7a85c17551e1ace64db242..ce3305be2b0e8ddd64ef5b303dd524d2f797817a 100644 (file)
--- a/src/lib/util/dict.h
+++ b/src/lib/util/dict.h
@@ -203,7 +203,7 @@ typedef struct {
        uint8_t                 ext[FR_DICT_ENUM_EXT_MAX];      //!< Extensions to the dictionary attribute.
 
        fr_dict_attr_t const    *child_struct[];                //!< for key fields
-} fr_dict_enum_t CC_HINT(aligned(FR_EXT_ALIGNMENT));
+} fr_dict_enum_value_t CC_HINT(aligned(FR_EXT_ALIGNMENT));
 
 /** Private enterprise
  *
@@ -551,11 +551,11 @@ fr_dict_attr_t const      *fr_dict_attr_by_name(fr_dict_attr_err_t *err, fr_dict_attr
 
 fr_dict_attr_t const   *fr_dict_attr_child_by_num(fr_dict_attr_t const *parent, unsigned int attr);
 
-fr_dict_enum_t         *fr_dict_enum_by_value(fr_dict_attr_t const *da, fr_value_box_t const *value);
+fr_dict_enum_value_t           *fr_dict_enum_by_value(fr_dict_attr_t const *da, fr_value_box_t const *value);
 
 char const             *fr_dict_enum_name_by_value(fr_dict_attr_t const *da, fr_value_box_t const *value);
 
-fr_dict_enum_t         *fr_dict_enum_by_name(fr_dict_attr_t const *da, char const *name, ssize_t len);
+fr_dict_enum_value_t           *fr_dict_enum_by_name(fr_dict_attr_t const *da, char const *name, ssize_t len);
 /** @} */
 
 /** @name Dictionary and protocol loading

diff --git a/src/lib/util/dict_ext.c b/src/lib/util/dict_ext.c
index 7d6cb6e81dee876e2bf77141f6287295562babcd..697e9efff6ce77b92275667a9684008395de310b 100644 (file)
--- a/src/lib/util/dict_ext.c
+++ b/src/lib/util/dict_ext.c
@@ -68,7 +68,7 @@ static int fr_dict_attr_ext_enumv_copy(UNUSED int ext,
        fr_dict_attr_t                  *da_dst = talloc_get_type_abort(chunk_dst, fr_dict_attr_t);
        fr_dict_attr_ext_enumv_t        *src_ext = src_ext_ptr;
        fr_hash_iter_t                  iter;
-       fr_dict_enum_t                  *enumv;
+       fr_dict_enum_value_t                    *enumv;
        bool                            has_child = fr_dict_attr_is_key_field(da_src);
 
        if (!src_ext->value_by_name) return 0;
@@ -222,7 +222,7 @@ void fr_dict_attr_ext_debug(fr_dict_attr_t const *da)
  *
  */
 fr_ext_t const fr_dict_enum_ext_def = {
-       .offset_of_exts = offsetof(fr_dict_enum_t, ext),
+       .offset_of_exts = offsetof(fr_dict_enum_value_t, ext),
        .name_table     = dict_enum_ext_table,
        .name_table_len = &dict_enum_ext_table_len,
        .max            = FR_DICT_ENUM_EXT_MAX,

diff --git a/src/lib/util/dict_print.c b/src/lib/util/dict_print.c
index 19d37b3ada24da660e5d7e2de9beca329e75425f..d37371a0168a70f06d16e74834b042881345182b 100644 (file)
--- a/src/lib/util/dict_print.c
+++ b/src/lib/util/dict_print.c
@@ -163,7 +163,7 @@ static int dict_attr_debug(fr_dict_attr_t const *da, void *uctx)
 {
        fr_dict_attr_debug_t            *our_uctx = uctx;
        fr_hash_iter_t                  iter;
-       fr_dict_enum_t const            *enumv;
+       fr_dict_enum_value_t const              *enumv;
        fr_dict_attr_ext_enumv_t        *ext;
 
        fr_dict_attr_flags_print(&FR_SBUFF_OUT(our_uctx->flags, sizeof(our_uctx->flags)),

diff --git a/src/lib/util/dict_util.c b/src/lib/util/dict_util.c
index ea155d5fff93b3b01068393ffb077a33bd78bddb..aefa3aa607a386aed51c7095ec2e79c66f1d7a1f 100644 (file)
--- a/src/lib/util/dict_util.c
+++ b/src/lib/util/dict_util.c
@@ -239,7 +239,7 @@ static int8_t dict_vendor_pen_cmp(void const *one, void const *two)
  */
 static uint32_t dict_enum_name_hash(void const *data)
 {
-       fr_dict_enum_t const *enumv = data;
+       fr_dict_enum_value_t const *enumv = data;
 
        return dict_hash_name((void const *)enumv->name, enumv->name_len);
 }
@@ -249,8 +249,8 @@ static uint32_t dict_enum_name_hash(void const *data)
  */
 static int8_t dict_enum_name_cmp(void const *one, void const *two)
 {
-       fr_dict_enum_t const *a = one;
-       fr_dict_enum_t const *b = two;
+       fr_dict_enum_value_t const *a = one;
+       fr_dict_enum_value_t const *b = two;
        int ret;
 
        ret = strcasecmp(a->name, b->name);
@@ -262,7 +262,7 @@ static int8_t dict_enum_name_cmp(void const *one, void const *two)
  */
 static uint32_t dict_enum_value_hash(void const *data)
 {
-       fr_dict_enum_t const *enumv = data;
+       fr_dict_enum_value_t const *enumv = data;
 
        return fr_value_box_hash(enumv->value);
 }
@@ -272,8 +272,8 @@ static uint32_t dict_enum_value_hash(void const *data)
  */
 static int8_t dict_enum_value_cmp(void const *one, void const *two)
 {
-       fr_dict_enum_t const *a = one;
-       fr_dict_enum_t const *b = two;
+       fr_dict_enum_value_t const *a = one;
+       fr_dict_enum_value_t const *b = two;
        int ret;
 
        ret = fr_value_box_cmp(a->value, b->value); /* not yet int8_t! */
@@ -879,7 +879,7 @@ int dict_vendor_add(fr_dict_t *dict, char const *name, unsigned int num)
  *  There is no other place for the sub-structures to go.  In the
  *  future, we may extend the functionality of the `key` field, by
  *  allowing non-integer data types.  That would require storing keys
- *  as #fr_dict_enum_t, and then placing the child (i.e. sub)
+ *  as #fr_dict_enum_value_t, and then placing the child (i.e. sub)
  *  structures there.  But that would involve adding children to
  *  enums, which is currently not supported.
  *
@@ -1217,7 +1217,7 @@ int dict_attr_enum_add_name(fr_dict_attr_t *da, char const *name,
                            fr_dict_attr_t const *child_struct)
 {
        size_t                          len;
-       fr_dict_enum_t                  *enumv = NULL;
+       fr_dict_enum_value_t                    *enumv = NULL;
        fr_value_box_t                  *enum_value = NULL;
        fr_dict_attr_ext_enumv_t        *ext;
 
@@ -1256,14 +1256,14 @@ int dict_attr_enum_add_name(fr_dict_attr_t *da, char const *name,
         *      Initialise enumv hash tables
         */
        if (!ext->value_by_name || !ext->name_by_value) {
-               ext->value_by_name = fr_hash_table_talloc_alloc(da, fr_dict_enum_t, dict_enum_name_hash,
+               ext->value_by_name = fr_hash_table_talloc_alloc(da, fr_dict_enum_value_t, dict_enum_name_hash,
                                                                dict_enum_name_cmp, hash_pool_free);
                if (!ext->value_by_name) {
                        fr_strerror_printf("Failed allocating \"value_by_name\" table");
                        return -1;
                }
 
-               ext->name_by_value = fr_hash_table_talloc_alloc(da, fr_dict_enum_t, dict_enum_value_hash,
+               ext->name_by_value = fr_hash_table_talloc_alloc(da, fr_dict_enum_value_t, dict_enum_value_hash,
                                                                dict_enum_value_cmp, NULL);
                if (!ext->name_by_value) {
                        fr_strerror_printf("Failed allocating \"name_by_value\" table");
@@ -1275,13 +1275,13 @@ int dict_attr_enum_add_name(fr_dict_attr_t *da, char const *name,
         *      Allocate a structure to map between
         *      the name and value.
         */
-       enumv = talloc_zero_size(da, sizeof(fr_dict_enum_t) + sizeof(enumv->child_struct[0]) * fr_dict_attr_is_key_field(da));
+       enumv = talloc_zero_size(da, sizeof(fr_dict_enum_value_t) + sizeof(enumv->child_struct[0]) * fr_dict_attr_is_key_field(da));
        if (!enumv) {
        oom:
                fr_strerror_printf("%s: Out of memory", __FUNCTION__);
                return -1;
        }
-       talloc_set_type(enumv, fr_dict_enum_t);
+       talloc_set_type(enumv, fr_dict_enum_value_t);
 
        enumv->name = talloc_typed_strdup(enumv, name);
        enumv->name_len = strlen(name);
@@ -1324,7 +1324,7 @@ int dict_attr_enum_add_name(fr_dict_attr_t *da, char const *name,
                memcpy(&tmp, &enumv, sizeof(tmp));
 
                if (!fr_hash_table_insert(ext->value_by_name, tmp)) {
-                       fr_dict_enum_t *old;
+                       fr_dict_enum_value_t *old;
 
                        /*
                         *      Suppress duplicates with the same
@@ -2743,10 +2743,10 @@ fr_dict_attr_t const *fr_dict_attr_child_by_num(fr_dict_attr_t const *parent, un
  * @param[in] da               to search in.
  * @param[in] value            to search for.
  * @return
- *     - Matching #fr_dict_enum_t.
- *     - NULL if no matching #fr_dict_enum_t could be found.
+ *     - Matching #fr_dict_enum_value_t.
+ *     - NULL if no matching #fr_dict_enum_value_t could be found.
  */
-fr_dict_enum_t *fr_dict_enum_by_value(fr_dict_attr_t const *da, fr_value_box_t const *value)
+fr_dict_enum_value_t *fr_dict_enum_by_value(fr_dict_attr_t const *da, fr_value_box_t const *value)
 {
        fr_dict_attr_ext_enumv_t        *ext;
 
@@ -2768,7 +2768,7 @@ fr_dict_enum_t *fr_dict_enum_by_value(fr_dict_attr_t const *da, fr_value_box_t c
         */
        if (value->type != da->type) return NULL;
 
-       return fr_hash_table_find(ext->name_by_value, &(fr_dict_enum_t){ .value = value });
+       return fr_hash_table_find(ext->name_by_value, &(fr_dict_enum_value_t){ .value = value });
 }
 
 /** Lookup the name of an enum value in a #fr_dict_attr_t
@@ -2781,7 +2781,7 @@ fr_dict_enum_t *fr_dict_enum_by_value(fr_dict_attr_t const *da, fr_value_box_t c
  */
 char const *fr_dict_enum_name_by_value(fr_dict_attr_t const *da, fr_value_box_t const *value)
 {
-       fr_dict_enum_t  *dv;
+       fr_dict_enum_value_t    *dv;
 
        dv = fr_dict_enum_by_value(da, value);
        if (!dv) return NULL;
@@ -2792,7 +2792,7 @@ char const *fr_dict_enum_name_by_value(fr_dict_attr_t const *da, fr_value_box_t
 /*
  *     Get a value by its name, keyed off of an attribute.
  */
-fr_dict_enum_t *fr_dict_enum_by_name(fr_dict_attr_t const *da, char const *name, ssize_t len)
+fr_dict_enum_value_t *fr_dict_enum_by_name(fr_dict_attr_t const *da, char const *name, ssize_t len)
 {
        fr_dict_attr_ext_enumv_t        *ext;
 
@@ -2812,7 +2812,7 @@ fr_dict_enum_t *fr_dict_enum_by_name(fr_dict_attr_t const *da, char const *name,
 
        if (len < 0) len = strlen(name);
 
-       return fr_hash_table_find(ext->value_by_name, &(fr_dict_enum_t){ .name = name, .name_len = len});
+       return fr_hash_table_find(ext->value_by_name, &(fr_dict_enum_value_t){ .name = name, .name_len = len});
 }
 
 int dict_dlopen(fr_dict_t *dict, char const *name)
@@ -3173,7 +3173,7 @@ int fr_dict_free(fr_dict_t **dict, char const *dependent)
 int fr_dict_enum_autoload(fr_dict_enum_autoload_t const *to_load)
 {
        fr_dict_enum_autoload_t const   *p = to_load;
-       fr_dict_enum_t const            *enumv;
+       fr_dict_enum_value_t const              *enumv;
 
        for (p = to_load; p->out; p++) {
                if (unlikely(!p->attr)) {

diff --git a/src/lib/util/pair.c b/src/lib/util/pair.c
index 25e298f82c23b2a34c517143c9853138f98f0dc7..d7104d9b6b3cff7c51fdf807874ac63cfd6f2043 100644 (file)
--- a/src/lib/util/pair.c
+++ b/src/lib/util/pair.c
@@ -2175,7 +2175,7 @@ int fr_pair_value_mem_append_buffer(fr_pair_t *vp, uint8_t *src, bool tainted)
 char const *fr_pair_value_enum(fr_pair_t const *vp, char buff[20])
 {
        char const              *str;
-       fr_dict_enum_t const    *enumv = NULL;
+       fr_dict_enum_value_t const      *enumv = NULL;
 
        if (!fr_box_is_numeric(&vp->data)) {
                fr_strerror_printf("Pair %s is not numeric", vp->da->name);
@@ -2213,7 +2213,7 @@ char const *fr_pair_value_enum(fr_pair_t const *vp, char buff[20])
  */
 int fr_pair_value_enum_box(fr_value_box_t const **out, fr_pair_t *vp)
 {
-       fr_dict_enum_t const    *dv;
+       fr_dict_enum_value_t const      *dv;
 
        if (!out || !vp ) return -1;
 

diff --git a/src/lib/util/struct.c b/src/lib/util/struct.c
index f7a3b9cd77eddcd7a50903deb627d7460d214374..046ba9bfdd9ce40237d3016633e365feef537b2b 100644 (file)
--- a/src/lib/util/struct.c
+++ b/src/lib/util/struct.c
@@ -292,7 +292,7 @@ ssize_t fr_struct_from_network(TALLOC_CTX *ctx, fr_dcursor_t *cursor,
         */
        if (key_vp) {
                ssize_t slen;
-               fr_dict_enum_t const *enumv;
+               fr_dict_enum_value_t const *enumv;
                child = NULL;
 
                FR_PROTO_HEX_DUMP(p, (end - p), "fr_struct_from_network - substruct");

diff --git a/src/lib/util/value.c b/src/lib/util/value.c
index b0725c3533411b7913f1b74b120f7d48141e7c2b..4b32afc3dcc548527a9489f298722b4a48ae7bb2 100644 (file)
--- a/src/lib/util/value.c
+++ b/src/lib/util/value.c
@@ -4474,7 +4474,7 @@ int fr_value_box_from_str(TALLOC_CTX *ctx, fr_value_box_t *dst,
                char            *tmp = NULL;
                char            *name;
                size_t          name_len;
-               fr_dict_enum_t  *enumv;
+               fr_dict_enum_value_t    *enumv;
 
                if (len > (sizeof(buffer) - 1)) {
                        name_len = fr_value_str_aunescape(NULL, &tmp,

diff --git a/src/listen/cron/proto_cron.c b/src/listen/cron/proto_cron.c
index bda8317e2f4405a4806432d31003d7b10d27e170..65ee251327ce69ebfdbe514e873abcb87fede6f2 100644 (file)
--- a/src/listen/cron/proto_cron.c
+++ b/src/listen/cron/proto_cron.c
@@ -107,7 +107,7 @@ fr_dict_attr_autoload_t proto_cron_dict_attr[] = {
 static int type_parse(UNUSED TALLOC_CTX *ctx, void *out, void *parent, CONF_ITEM *ci, UNUSED CONF_PARSER const *rule)
 {
        proto_cron_t            *inst = talloc_get_type_abort(parent, proto_cron_t);
-       fr_dict_enum_t const    *type_enum;
+       fr_dict_enum_value_t const      *type_enum;
        CONF_PAIR               *cp = cf_item_to_pair(ci);
        char const              *value = cf_pair_value(cp);
 

diff --git a/src/listen/detail/proto_detail.c b/src/listen/detail/proto_detail.c
index f3cbc52186d9661a4ae960b28c6204bca80379df..060436216e68f847ccafdabe2ed1312558cc779e 100644 (file)
--- a/src/listen/detail/proto_detail.c
+++ b/src/listen/detail/proto_detail.c
@@ -117,7 +117,7 @@ fr_dict_attr_autoload_t proto_detail_dict_attr[] = {
 static int type_parse(UNUSED TALLOC_CTX *ctx, void *out, void *parent, CONF_ITEM *ci, UNUSED CONF_PARSER const *rule)
 {
        proto_detail_t          *inst = talloc_get_type_abort(parent, proto_detail_t);
-       fr_dict_enum_t const    *type_enum;
+       fr_dict_enum_value_t const      *type_enum;
        CONF_PAIR               *cp = cf_item_to_pair(ci);
        char const              *value = cf_pair_value(cp);
 

diff --git a/src/listen/dhcpv4/proto_dhcpv4.c b/src/listen/dhcpv4/proto_dhcpv4.c
index af4043857473ca6961adf226f04939bce408401d..d8d89e7a62f437130b84d6dc23aae7e80e6012d0 100644 (file)
--- a/src/listen/dhcpv4/proto_dhcpv4.c
+++ b/src/listen/dhcpv4/proto_dhcpv4.c
@@ -120,7 +120,7 @@ static int type_parse(UNUSED TALLOC_CTX *ctx, void *out, void *parent,
                      CONF_ITEM *ci, UNUSED CONF_PARSER const *rule)
 {
        proto_dhcpv4_t          *inst = talloc_get_type_abort(parent, proto_dhcpv4_t);
-       fr_dict_enum_t          *dv;
+       fr_dict_enum_value_t            *dv;
        CONF_PAIR               *cp;
        char const              *value;
 

diff --git a/src/listen/dhcpv6/proto_dhcpv6.c b/src/listen/dhcpv6/proto_dhcpv6.c
index d2a935b476eb71652750e65af681ec4744764501..9ab971a05228a39beeaf3a06ffec0ed2675d3d5a 100644 (file)
--- a/src/listen/dhcpv6/proto_dhcpv6.c
+++ b/src/listen/dhcpv6/proto_dhcpv6.c
@@ -120,7 +120,7 @@ static int type_parse(UNUSED TALLOC_CTX *ctx, void *out, void *parent,
                      CONF_ITEM *ci, UNUSED CONF_PARSER const *rule)
 {
        proto_dhcpv6_t          *inst = talloc_get_type_abort(parent, proto_dhcpv6_t);
-       fr_dict_enum_t          *dv;
+       fr_dict_enum_value_t            *dv;
        CONF_PAIR               *cp;
        char const              *value;
 

diff --git a/src/listen/load/proto_load.c b/src/listen/load/proto_load.c
index 7ee04ca8265b5a981353a1889a45f4da40539e6d..d87e84d84af4f8c31357deed32143a9dc71cf3d4 100644 (file)
--- a/src/listen/load/proto_load.c
+++ b/src/listen/load/proto_load.c
@@ -107,7 +107,7 @@ fr_dict_attr_autoload_t proto_load_dict_attr[] = {
 static int type_parse(UNUSED TALLOC_CTX *ctx, void *out, void *parent, CONF_ITEM *ci, UNUSED CONF_PARSER const *rule)
 {
        proto_load_t            *inst = talloc_get_type_abort(parent, proto_load_t);
-       fr_dict_enum_t const    *type_enum;
+       fr_dict_enum_value_t const      *type_enum;
        CONF_PAIR               *cp = cf_item_to_pair(ci);
        char const              *value = cf_pair_value(cp);
 

diff --git a/src/listen/radius/proto_radius.c b/src/listen/radius/proto_radius.c
index 28e144d32d0c882fb636110a5e5c9dd538616303..497c438a880154017d24505c5b30d0e9202089fe 100644 (file)
--- a/src/listen/radius/proto_radius.c
+++ b/src/listen/radius/proto_radius.c
@@ -126,7 +126,7 @@ fr_dict_attr_autoload_t proto_radius_dict_attr[] = {
 static int type_parse(UNUSED TALLOC_CTX *ctx, void *out, void *parent, CONF_ITEM *ci, UNUSED CONF_PARSER const *rule)
 {
        proto_radius_t          *inst = talloc_get_type_abort(parent, proto_radius_t);
-       fr_dict_enum_t          *dv;
+       fr_dict_enum_value_t            *dv;
        CONF_PAIR               *cp;
        char const              *value;
 

diff --git a/src/listen/tacacs/proto_tacacs.c b/src/listen/tacacs/proto_tacacs.c
index 1253262e3b194aa75188bdf5c2bbdc4bbeccf64c..7f6c08894f7adbacc9a8ac9175a931a52f4ca3ec 100644 (file)
--- a/src/listen/tacacs/proto_tacacs.c
+++ b/src/listen/tacacs/proto_tacacs.c
@@ -101,7 +101,7 @@ fr_dict_attr_autoload_t proto_tacacs_dict_attr[] = {
 static int type_parse(UNUSED TALLOC_CTX *ctx, void *out, void *parent, CONF_ITEM *ci, UNUSED CONF_PARSER const *rule)
 {
        proto_tacacs_t          *inst = talloc_get_type_abort(parent, proto_tacacs_t);
-       fr_dict_enum_t          *dv;
+       fr_dict_enum_value_t            *dv;
        CONF_PAIR               *cp;
        char const              *value;
 

diff --git a/src/listen/vmps/proto_vmps.c b/src/listen/vmps/proto_vmps.c
index c55a052f5c5b5b2aef6b2a5e294359c3c415d9d6..2a2524587a7ae7944d7d4de5ed17a013536481bb 100644 (file)
--- a/src/listen/vmps/proto_vmps.c
+++ b/src/listen/vmps/proto_vmps.c
@@ -109,7 +109,7 @@ static int type_parse(UNUSED TALLOC_CTX *ctx, void *out, void *parent,
                      CONF_ITEM *ci, UNUSED CONF_PARSER const *rule)
 {
        proto_vmps_t            *inst = talloc_get_type_abort(parent, proto_vmps_t);
-       fr_dict_enum_t          *dv;
+       fr_dict_enum_value_t            *dv;
        CONF_PAIR               *cp;
        char const              *value;
 

diff --git a/src/modules/rlm_chap/rlm_chap.c b/src/modules/rlm_chap/rlm_chap.c
index c78e950cb7cdab943b63548906360cc51d9a3185..3519ca272d12b0f5d89e67dea6f34a0d07c0ad57 100644 (file)
--- a/src/modules/rlm_chap/rlm_chap.c
+++ b/src/modules/rlm_chap/rlm_chap.c
@@ -33,7 +33,7 @@ RCSID("$Id$")
 
 typedef struct {
        char const              *name;          //!< Auth-Type value for this module instance.
-       fr_dict_enum_t          *auth_type;
+       fr_dict_enum_value_t            *auth_type;
 } rlm_chap_t;
 
 static fr_dict_t const *dict_freeradius;

diff --git a/src/modules/rlm_digest/rlm_digest.c b/src/modules/rlm_digest/rlm_digest.c
index 81a5139b766e0e5ee46ea6f04e8b55e1393366f6..b11bb091cb247ea7ceaa9b2bde3688a6446dd431 100644 (file)
--- a/src/modules/rlm_digest/rlm_digest.c
+++ b/src/modules/rlm_digest/rlm_digest.c
@@ -32,7 +32,7 @@ RCSID("$Id$")
 
 typedef struct {
        char const              *name;          //!< Auth-Type value for this module instance.
-       fr_dict_enum_t          *auth_type;
+       fr_dict_enum_value_t            *auth_type;
 } rlm_digest_t;
 
 static fr_dict_t const *dict_freeradius;

diff --git a/src/modules/rlm_eap/rlm_eap.h b/src/modules/rlm_eap/rlm_eap.h
index dbf412660a4107381691eb7ff0ae2deb5114e0fc..26cd421bf77a7d11a521c4ff1eecd35390a35677 100644 (file)
--- a/src/modules/rlm_eap/rlm_eap.h
+++ b/src/modules/rlm_eap/rlm_eap.h
@@ -66,7 +66,7 @@ typedef struct {
        rlm_eap_require_realm_t         require_realm;                  //!< Whether we require the outer identity
                                                                        ///< to contain a realm.
        char const                      *name;                          //!< Name of this instance.
-       fr_dict_enum_t                  *auth_type;
+       fr_dict_enum_value_t                    *auth_type;
 
        fr_randctx                      rand_pool;                      //!< Pool of random data.
 } rlm_eap_t;

diff --git a/src/modules/rlm_eap/types/rlm_eap_gtc/rlm_eap_gtc.c b/src/modules/rlm_eap/types/rlm_eap_gtc/rlm_eap_gtc.c
index 26a8b2aa7e3096740a8afe76e0b8e74a97e99e80..005f7f6539216258cddf7fa5e2fed0cc718ad46a 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_gtc/rlm_eap_gtc.c
+++ b/src/modules/rlm_eap/types/rlm_eap_gtc/rlm_eap_gtc.c
@@ -39,7 +39,7 @@ static int auth_type_parse(TALLOC_CTX *ctx, void *out, UNUSED void *parent,
  */
 typedef struct {
        char const              *challenge;
-       fr_dict_enum_t const    *auth_type;
+       fr_dict_enum_value_t const      *auth_type;
 } rlm_eap_gtc_t;
 
 static CONF_PARSER submodule_config[] = {
@@ -90,7 +90,7 @@ static int auth_type_parse(UNUSED TALLOC_CTX *ctx, void *out, UNUSED void *paren
                cf_log_err(ci, "Failed adding %s alias", attr_auth_type->name);
                return -1;
        }
-       *((fr_dict_enum_t **)out) = fr_dict_enum_by_name(attr_auth_type, auth_type, -1);
+       *((fr_dict_enum_value_t **)out) = fr_dict_enum_by_name(attr_auth_type, auth_type, -1);
 
        return 0;
 }

diff --git a/src/modules/rlm_eap/types/rlm_eap_mschapv2/rlm_eap_mschapv2.c b/src/modules/rlm_eap/types/rlm_eap_mschapv2/rlm_eap_mschapv2.c
index 6829dd1edf6f5bb6333a5dc8435f396106c5caa4..4cda58c38678bf9cf0384eaabaff3e985f7fa0a2 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_mschapv2/rlm_eap_mschapv2.c
+++ b/src/modules/rlm_eap/types/rlm_eap_mschapv2/rlm_eap_mschapv2.c
@@ -35,7 +35,7 @@ typedef struct {
        bool                    with_ntdomain_hack;
        bool                    send_error;
        char const              *identity;
-       fr_dict_enum_t          *auth_type;
+       fr_dict_enum_value_t            *auth_type;
 } rlm_eap_mschapv2_t;
 
 static CONF_PARSER submodule_config[] = {
@@ -139,7 +139,7 @@ static int auth_type_parse(UNUSED TALLOC_CTX *ctx, void *out, UNUSED void *paren
                cf_log_err(ci, "Failed adding %s alias", attr_auth_type->name);
                return -1;
        }
-       *((fr_dict_enum_t **)out) = fr_dict_enum_by_name(attr_auth_type, auth_type, -1);
+       *((fr_dict_enum_value_t **)out) = fr_dict_enum_by_name(attr_auth_type, auth_type, -1);
 
        return 0;
 }

diff --git a/src/modules/rlm_mschap/rlm_mschap.h b/src/modules/rlm_mschap/rlm_mschap.h
index ca69b236aa240789d88ac22bb2bd4fd1008da84f..4a36ffff8240215bb4730ec51d374cbc6a3ec73c 100644 (file)
--- a/src/modules/rlm_mschap/rlm_mschap.h
+++ b/src/modules/rlm_mschap/rlm_mschap.h
@@ -51,7 +51,7 @@ extern fr_dict_attr_t const *attr_ms_chap2_cpw;
 
 typedef struct {
        char const              *name;
-       fr_dict_enum_t          *auth_type;
+       fr_dict_enum_value_t            *auth_type;
 
        bool                    normify;
 

diff --git a/src/modules/rlm_opendirectory/rlm_opendirectory.c b/src/modules/rlm_opendirectory/rlm_opendirectory.c
index 22c1e51a437bfcdb864eca9ae072a334aa660b4a..3c8e98fc56bb0ca3ed915d0cf830ee6b4ea712c7 100644 (file)
--- a/src/modules/rlm_opendirectory/rlm_opendirectory.c
+++ b/src/modules/rlm_opendirectory/rlm_opendirectory.c
@@ -47,7 +47,7 @@ USES_APPLE_DEPRECATED_API
 
 typedef struct {
        char const              *name;          //!< Auth-Type value for this module instance.
-       fr_dict_enum_t          *auth_type;
+       fr_dict_enum_value_t            *auth_type;
 } rlm_opendirectory_t;
 
 #ifndef HAVE_DECL_MBR_CHECK_SERVICE_MEMBERSHIP

diff --git a/src/modules/rlm_pap/rlm_pap.c b/src/modules/rlm_pap/rlm_pap.c
index b1d1da760454fa4f6427cf88786d1296892e896b..3b2c5e97adc73cba5082f5e6fe4403bb9de06551 100644 (file)
--- a/src/modules/rlm_pap/rlm_pap.c
+++ b/src/modules/rlm_pap/rlm_pap.c
@@ -68,7 +68,7 @@ static pthread_mutex_t fr_crypt_mutex = PTHREAD_MUTEX_INITIALIZER;
  */
 typedef struct {
        char const              *name;
-       fr_dict_enum_t          *auth_type;
+       fr_dict_enum_value_t            *auth_type;
        bool                    normify;
 } rlm_pap_t;
 

diff --git a/src/modules/rlm_radius/rlm_radius.c b/src/modules/rlm_radius/rlm_radius.c
index 8a03a6f210396df2ad3f3b9c09ebfd6f60ba845a..3c00bf65aa71d2902f5389cf53164d1db38f6185 100644 (file)
--- a/src/modules/rlm_radius/rlm_radius.c
+++ b/src/modules/rlm_radius/rlm_radius.c
@@ -175,7 +175,7 @@ static int type_parse(UNUSED TALLOC_CTX *ctx, void *out, UNUSED void *parent,
 {
        char const              *type_str = cf_pair_value(cf_item_to_pair(ci));
        CONF_SECTION            *cs = cf_item_to_section(cf_parent(ci));
-       fr_dict_enum_t const    *type_enum;
+       fr_dict_enum_value_t const      *type_enum;
        uint32_t                code;
 
        /*
@@ -269,7 +269,7 @@ static int status_check_type_parse(UNUSED TALLOC_CTX *ctx, void *out, UNUSED voi
 {
        char const              *type_str = cf_pair_value(cf_item_to_pair(ci));
        CONF_SECTION            *cs = cf_item_to_section(cf_parent(ci));
-       fr_dict_enum_t const    *type_enum;
+       fr_dict_enum_value_t const      *type_enum;
        uint32_t                code;
 
        /*

diff --git a/src/modules/rlm_rediswho/rlm_rediswho.c b/src/modules/rlm_rediswho/rlm_rediswho.c
index 281d5af3e299041963277e5bd111cdd7374cc13a..a1ea02036c264b440cb551225e5f58c72b0b4d3e 100644 (file)
--- a/src/modules/rlm_rediswho/rlm_rediswho.c
+++ b/src/modules/rlm_rediswho/rlm_rediswho.c
@@ -201,7 +201,7 @@ static unlang_action_t CC_HINT(nonnull) mod_accounting(rlm_rcode_t *p_result, mo
        rlm_rediswho_t const    *inst = talloc_get_type_abort_const(mctx->instance, rlm_rediswho_t);
        rlm_rcode_t             rcode;
        fr_pair_t               *vp;
-       fr_dict_enum_t          *dv;
+       fr_dict_enum_value_t            *dv;
        CONF_SECTION            *cs;
        char const              *insert, *trim, *expire;
 

diff --git a/src/modules/rlm_smtp/rlm_smtp.c b/src/modules/rlm_smtp/rlm_smtp.c
index d7e60ef20a21b10c6742a1a8db0e459b479295db..3fb58d067cbe69895bcf4bce99d5e33f15155f23 100644 (file)
--- a/src/modules/rlm_smtp/rlm_smtp.c
+++ b/src/modules/rlm_smtp/rlm_smtp.c
@@ -71,7 +71,7 @@ typedef struct {
        fr_time_delta_t         timeout;                //!< Timeout for connection and server response
        fr_curl_tls_t           tls;                    //!< Used for handled all tls specific curl components
        char const              *name;                  //!< Auth-Type value for this module instance.
-       fr_dict_enum_t          *auth_type;
+       fr_dict_enum_value_t            *auth_type;
        fr_map_list_t           header_maps;            //!< Attribute map used to process header elements
        CONF_SECTION            *cs;
        bool                    set_date;

diff --git a/src/modules/rlm_winbind/rlm_winbind.h b/src/modules/rlm_winbind/rlm_winbind.h
index bdb00be4236ec7e3e8c5e2fd29c84beda056f4b4..bf59605ead07075b41f2231ec729416ed1cda03e 100644 (file)
--- a/src/modules/rlm_winbind/rlm_winbind.h
+++ b/src/modules/rlm_winbind/rlm_winbind.h
@@ -11,7 +11,7 @@
 typedef struct {
        char const              *name;
        fr_pool_t               *wb_pool;
-       fr_dict_enum_t          *auth_type;
+       fr_dict_enum_value_t            *auth_type;
 
        /* main config */
        tmpl_t          *wb_username;

diff --git a/src/modules/rlm_yubikey/rlm_yubikey.h b/src/modules/rlm_yubikey/rlm_yubikey.h
index faceb674f51c0b41392637a958c78ee9366bb840..3091e9376520e9a5bce4f76ae37c0fc4cf8f89e1 100644 (file)
--- a/src/modules/rlm_yubikey/rlm_yubikey.h
+++ b/src/modules/rlm_yubikey/rlm_yubikey.h
@@ -39,7 +39,7 @@
  */
 typedef struct {
        char const              *name;                  //!< Instance name.
-       fr_dict_enum_t          *auth_type;             //!< Our Auth-Type.
+       fr_dict_enum_value_t            *auth_type;             //!< Our Auth-Type.
        unsigned int            id_len;                 //!< The length of the Public ID portion of the OTP string.
        bool                    split;                  //!< Split password string into components.
        bool                    decrypt;                //!< Decrypt the OTP string using the yubikey library.

diff --git a/src/process/radius/base.c b/src/process/radius/base.c
index d3aa79316f49edf28541a39fae12abb6c2ed43e5..b501301f58aa0ce4d3ba6458308e44439905519f 100644 (file)
--- a/src/process/radius/base.c
+++ b/src/process/radius/base.c
@@ -378,7 +378,7 @@ RESUME(access_request)
        rlm_rcode_t                     rcode = request->rcode;
        fr_pair_t                       *vp;
        CONF_SECTION                    *cs;
-       fr_dict_enum_t const            *dv;
+       fr_dict_enum_value_t const              *dv;
        fr_process_state_t const        *state;
        process_radius_t const          *inst = talloc_get_type_abort_const(mctx->instance, process_radius_t);
 
@@ -656,7 +656,7 @@ RESUME(accounting_request)
        rlm_rcode_t                     rcode = request->rcode;
        fr_pair_t                       *vp;
        CONF_SECTION                    *cs;
-       fr_dict_enum_t const            *dv;
+       fr_dict_enum_value_t const              *dv;
        fr_process_state_t const        *state;
        process_radius_t const          *inst = talloc_get_type_abort_const(mctx->instance, process_radius_t);
 

diff --git a/src/process/tacacs/base.c b/src/process/tacacs/base.c
index 6c777f7db829f65d87103932114e46d24541af4f..9c6ee5843e539c8bb11ebdaea605177b8bd6ac5c 100644 (file)
--- a/src/process/tacacs/base.c
+++ b/src/process/tacacs/base.c
@@ -274,7 +274,7 @@ RESUME(recv_tacacs)
                 */
                if (state->attr_process) {
                        fr_pair_t *vp;
-                       fr_dict_enum_t const *dv;
+                       fr_dict_enum_value_t const *dv;
                        CONF_SECTION *subcs;
 
                        vp = fr_pair_find_by_da(&request->request_pairs, *state->attr_process, 0);

diff --git a/src/process/ttls/base.c b/src/process/ttls/base.c
index 80be20ac6467b559363a1b1723a41d86a9848ad1..3863a22c73f85fffa0457f89d8c262e8eedafebb 100644 (file)
--- a/src/process/ttls/base.c
+++ b/src/process/ttls/base.c
@@ -359,7 +359,7 @@ RESUME(access_request)
        rlm_rcode_t                     rcode = request->rcode;
        fr_pair_t                       *vp;
        CONF_SECTION                    *cs;
-       fr_dict_enum_t const            *dv;
+       fr_dict_enum_value_t const              *dv;
        fr_process_state_t const        *state;
        process_ttls_t const            *inst = talloc_get_type_abort_const(mctx->instance, process_ttls_t);