De-consitfy dictionary pointers so modules can add their own attributes

diff --git a/src/include/dict.h b/src/include/dict.h
index 25db2c2d6a3055ed5b07ce7185c0db0fee6c075c..8e225d2d995e0d83f87bd8a7601dd969656e1a6a 100644 (file)
--- a/src/include/dict.h
+++ b/src/include/dict.h
@@ -140,7 +140,7 @@ typedef struct {
 typedef struct {
        fr_dict_attr_t const    **out;                          //!< Where to write a pointer to the resolved
                                                                //!< #fr_dict_attr_t.
-       fr_dict_t const         **dict;                         //!< The protocol dictionary the attribute should
+       fr_dict_t               **dict;                         //!< The protocol dictionary the attribute should
                                                                ///< be resolved in. ** so it's a compile time
                                                                ///< constant.
        char const              *name;                          //!< of the attribute.
@@ -151,7 +151,7 @@ typedef struct {
  *
  */
 typedef struct {
-       fr_dict_t const         **out;                          //!< Where to write a pointer to the loaded/resolved
+       fr_dict_t               **out;                          //!< Where to write a pointer to the loaded/resolved
                                                                //!< #fr_dict_t.
        char const              *base_dir;                      //!< Directory structure beneath share.
        char const              *proto;                         //!< The protocol dictionary name.

diff --git a/src/lib/soh/soh.c b/src/lib/soh/soh.c
index ab936d2a2b716d5d904a759805aa6297160dda1f..92f8674d7ee1adea1fcfc6d848c19b3256794311 100644 (file)
--- a/src/lib/soh/soh.c
+++ b/src/lib/soh/soh.c
@@ -84,7 +84,7 @@ typedef struct {
        uint16_t tlv_len;
 } soh_tlv;
 
-static fr_dict_t const *dict_freeradius;
+static fr_dict_t *dict_freeradius;
 
 extern fr_dict_autoload_t soh_dict[];
 fr_dict_autoload_t soh_dict[] = {

diff --git a/src/lib/tls/base.c b/src/lib/tls/base.c
index 53f8259bc3d77cd3bff7d6600ffafe44b8f173e0..f02018e1b3dcaf5a22e6a7be5b256fb28074b034 100644 (file)
--- a/src/lib/tls/base.c
+++ b/src/lib/tls/base.c
@@ -39,8 +39,8 @@ USES_APPLE_DEPRECATED_API     /* OpenSSL API has been deprecated by Apple */
 
 static int instance_count = 0;
 
-fr_dict_t const *dict_freeradius;
-fr_dict_t const *dict_radius;
+fr_dict_t *dict_freeradius;
+fr_dict_t *dict_radius;
 
 extern fr_dict_autoload_t tls_dict[];
 fr_dict_autoload_t tls_dict[] = {

diff --git a/src/lib/tls/tls_attrs.h b/src/lib/tls/tls_attrs.h
index acbc2edc9846440b12a8cac982835f997db88a27..70df389e400cec3ecd14bb19543d0adff578a45d 100644 (file)
--- a/src/lib/tls/tls_attrs.h
+++ b/src/lib/tls/tls_attrs.h
@@ -24,8 +24,8 @@
  */
 RCSIDH(tls_attrs_h, "$Id$")
 
-extern fr_dict_t const *dict_freeradius;
-extern fr_dict_t const *dict_radius;
+extern fr_dict_t *dict_freeradius;
+extern fr_dict_t *dict_radius;
 
 extern fr_dict_attr_t const *attr_allow_session_resumption;
 extern fr_dict_attr_t const *attr_eap_session_resumed;

diff --git a/src/lib/util/dict.c b/src/lib/util/dict.c
index 44a49bcf6d0f9a84c25760ba66a706a567ca44ed..1652121c7cdb8f18f881f8094485be297cd7ee6e 100644 (file)
--- a/src/lib/util/dict.c
+++ b/src/lib/util/dict.c
@@ -5298,7 +5298,7 @@ int fr_dict_autoload(fr_dict_autoload_t const *to_load)
  */
 void fr_dict_autofree(fr_dict_autoload_t const *to_free)
 {
-       fr_dict_t const                 **dict;
+       fr_dict_t                       **dict;
        fr_dict_autoload_t const        *p = to_free;
 
        for (p = to_free; p->out; p++) {

diff --git a/src/main/log.c b/src/main/log.c
index 649160f29bac216224864fc1864f9b88d8183aca..063db5ae9e14c95b6f2612d29da20716887186d5 100644 (file)
--- a/src/main/log.c
+++ b/src/main/log.c
@@ -160,7 +160,7 @@ const FR_NAME_NUMBER log_str2dst[] = {
 
 static char const spaces[] = "                                                                                                                        ";
 
-static fr_dict_t const *dict_freeradius;
+static fr_dict_t *dict_freeradius;
 
 extern fr_dict_autoload_t log_dict[];
 fr_dict_autoload_t log_dict[] = {

diff --git a/src/main/paircmp.c b/src/main/paircmp.c
index 7aab8dc28461f3052174576495c22397e8e87cf2..0a172f5bb494fa34eaf0e84a6c8981e57c3caf80 100644 (file)
--- a/src/main/paircmp.c
+++ b/src/main/paircmp.c
@@ -44,8 +44,8 @@ struct paircmp_s {
        paircmp_t               *next;
 };
 
-static fr_dict_t const *dict_freeradius;
-static fr_dict_t const *dict_radius;
+static fr_dict_t *dict_freeradius;
+static fr_dict_t *dict_radius;
 
 extern fr_dict_autoload_t paircmp_dict[];
 fr_dict_autoload_t paircmp_dict[] = {

diff --git a/src/main/radclient.c b/src/main/radclient.c
index f06cd69c28398a361dc9b13e0e3803c725df2d0d..19e99d056a7aaa0b613108cc3b11a1760acff99c 100644 (file)
--- a/src/main/radclient.c
+++ b/src/main/radclient.c
@@ -79,8 +79,8 @@ static rc_request_t *rc_request_tail = NULL;
 
 static char const *radclient_version = RADIUSD_VERSION_STRING_BUILD("radclient");
 
-static fr_dict_t const *dict_freeradius;
-static fr_dict_t const *dict_radius;
+static fr_dict_t *dict_freeradius;
+static fr_dict_t *dict_radius;
 
 extern fr_dict_autoload_t radclient_dict[];
 fr_dict_autoload_t radclient_dict[] = {

diff --git a/src/main/radsnmp.c b/src/main/radsnmp.c
index 70d96e38572ef749765fd6dad360a4acd0eb85ee..96048a2410d5683a49023738cad3749493a53a08 100644 (file)
--- a/src/main/radsnmp.c
+++ b/src/main/radsnmp.c
@@ -91,10 +91,12 @@ typedef struct radsnmp_conf {
        char                    *secret;                //!< Shared secret.
 } radsnmp_conf_t;
 
-static fr_dict_t const *dict_radius;
+static fr_dict_t *dict_freeradius;
+static fr_dict_t *dict_radius;
 
 extern fr_dict_autoload_t radsnmp_dict[];
 fr_dict_autoload_t radsnmp_dict[] = {
+       { .out = &dict_freeradius, .proto = "freeradius" },
        { .out = &dict_radius, .proto = "radius" },
        { NULL }
 };
@@ -1063,15 +1065,9 @@ int main(int argc, char **argv)
                exit(EXIT_FAILURE);
        }
 
-       {
-               fr_dict_t *mutable;
-
-               memcpy(&mutable, &dict_radius, sizeof(mutable));
-
-               if (fr_dict_read(mutable, conf->radius_dir, FR_DICTIONARY_FILE) == -1) {
-                       fr_perror("radsnmp");
-                       exit(EXIT_FAILURE);
-               }
+       if (fr_dict_read(dict_freeradius, conf->radius_dir, FR_DICTIONARY_FILE) == -1) {
+               fr_perror("radsnmp");
+               exit(EXIT_FAILURE);
        }
        fr_strerror();  /* Clear the error buffer */
 

diff --git a/src/main/unit_test_module.c b/src/main/unit_test_module.c
index 7cd470ba3d5b5019ffed746a8107badf83206d12..9f457573a204795768dba2c4fb362401f4c752a4 100644 (file)
--- a/src/main/unit_test_module.c
+++ b/src/main/unit_test_module.c
@@ -50,8 +50,8 @@ static bool filedone = false;
 
 char const *radiusd_version = RADIUSD_VERSION_STRING_BUILD("unittest");
 
-static fr_dict_t const *dict_freeradius;
-static fr_dict_t const *dict_radius;
+static fr_dict_t *dict_freeradius;
+static fr_dict_t *dict_radius;
 
 extern fr_dict_autoload_t unit_test_module_dict[];
 fr_dict_autoload_t unit_test_module_dict[] = {

diff --git a/src/modules/proto_arp/proto_arp.c b/src/modules/proto_arp/proto_arp.c
index 3b03be895ccf1515d24fa46b8bda1cbff1b0a234..15b25c8cefceb7c9e500e18b1958ddafa766c0db 100644 (file)
--- a/src/modules/proto_arp/proto_arp.c
+++ b/src/modules/proto_arp/proto_arp.c
@@ -50,7 +50,7 @@ typedef struct arp_over_ether {
        uint8_t         tpa[4];                 //!< Target protocol address.
 } arp_over_ether_t;
 
-static fr_dict_t const *dict_arp;
+static fr_dict_t *dict_arp;
 
 extern fr_dict_autoload_t proto_arp_dict[];
 fr_dict_autoload_t proto_arp_dict[] = {

diff --git a/src/modules/proto_bfd/proto_bfd.c b/src/modules/proto_bfd/proto_bfd.c
index 44eb6f63858dbafd652616b047df6c8551df9cbe..5f80b8fed61612ceacbae2b6a482c8c298c2127f 100644 (file)
--- a/src/modules/proto_bfd/proto_bfd.c
+++ b/src/modules/proto_bfd/proto_bfd.c
@@ -228,7 +228,7 @@ typedef struct bfd_socket_t {
        rbtree_t        *session_tree;
 } bfd_socket_t;
 
-static fr_dict_t const *dict_bfd;
+static fr_dict_t *dict_bfd;
 
 extern fr_dict_autoload_t proto_bfd_dict[];
 fr_dict_autoload_t proto_bfd_dict[] = {

diff --git a/src/modules/proto_detail/proto_detail.c b/src/modules/proto_detail/proto_detail.c
index 23ac7aedb7f14f43e00431abba10c81feafce5cf..ae0010e08d2b851ac694287f4de997fd3e18900e 100644 (file)
--- a/src/modules/proto_detail/proto_detail.c
+++ b/src/modules/proto_detail/proto_detail.c
@@ -69,8 +69,8 @@ static CONF_PARSER const proto_detail_config[] = {
        CONF_PARSER_TERMINATOR
 };
 
-static fr_dict_t const *dict_freeradius;
-static fr_dict_t const *dict_radius;
+static fr_dict_t *dict_freeradius;
+static fr_dict_t *dict_radius;
 
 extern fr_dict_autoload_t proto_detail_dict[];
 fr_dict_autoload_t proto_detail_dict[] = {

diff --git a/src/modules/proto_detail/proto_detail_process.c b/src/modules/proto_detail/proto_detail_process.c
index 07dc79384d08cc7d1486178b9563039449618575..9bdaf83d6d5881f5f7a56e3ff5b23a2af9d82165 100644 (file)
--- a/src/modules/proto_detail/proto_detail_process.c
+++ b/src/modules/proto_detail/proto_detail_process.c
@@ -31,7 +31,7 @@
 #include <freeradius-devel/rad_assert.h>
 #include "proto_detail.h"
 
-static fr_dict_t const *dict_freeradius;
+static fr_dict_t *dict_freeradius;
 
 extern fr_dict_autoload_t proto_detail_process_dict[];
 fr_dict_autoload_t proto_detail_process_dict[] = {

diff --git a/src/modules/proto_detail/proto_detail_work.c b/src/modules/proto_detail/proto_detail_work.c
index 409cc283c6dd05c987b9a85a2c23326b109bcfe4..cef502e36ca14896b367a520b5f9509c1d1cf810 100644 (file)
--- a/src/modules/proto_detail/proto_detail_work.c
+++ b/src/modules/proto_detail/proto_detail_work.c
@@ -85,7 +85,7 @@ static const CONF_PARSER file_listen_config[] = {
        CONF_PARSER_TERMINATOR
 };
 
-static fr_dict_t const *dict_freeradius;
+static fr_dict_t *dict_freeradius;
 
 extern fr_dict_autoload_t proto_detail_work_dict[];
 fr_dict_autoload_t proto_detail_work_dict[] = {

diff --git a/src/modules/proto_dhcpv4/dhcpclient.c b/src/modules/proto_dhcpv4/dhcpclient.c
index 7f9c098b68ab9b4f1246e8fe59c56e5c38ce2b54..521a852b6aa40bd314673b8735f6464956814763 100644 (file)
--- a/src/modules/proto_dhcpv4/dhcpclient.c
+++ b/src/modules/proto_dhcpv4/dhcpclient.c
@@ -76,8 +76,8 @@ typedef struct dc_offer {
        uint32_t offered_addr;
 } dc_offer_t;
 
-static fr_dict_t const *dict_freeradius;
-static fr_dict_t const *dict_dhcpv4;
+static fr_dict_t *dict_freeradius;
+static fr_dict_t *dict_dhcpv4;
 
 extern fr_dict_autoload_t dhcpclient_dict[];
 fr_dict_autoload_t dhcpclient_dict[] = {
@@ -669,15 +669,9 @@ int main(int argc, char **argv)
                exit(EXIT_FAILURE);
        }
 
-       {
-               fr_dict_t *mutable;
-
-               memcpy(&mutable, &dict_freeradius, sizeof(mutable));
-
-               if (fr_dict_read(mutable, raddb_dir, FR_DICTIONARY_FILE) == -1) {
-                       fr_perror("dhcpclient");
-                       exit(EXIT_FAILURE);
-               }
+       if (fr_dict_read(dict_freeradius, raddb_dir, FR_DICTIONARY_FILE) == -1) {
+               fr_perror("dhcpclient");
+               exit(EXIT_FAILURE);
        }
        fr_strerror();  /* Clear the error buffer */
 

diff --git a/src/modules/proto_dhcpv4/proto_dhcpv4.c b/src/modules/proto_dhcpv4/proto_dhcpv4.c
index cafa9609e9325257f6b838ef860c6c70cf1b4417..89da3c2e2a013a37d7bf686ae8706ec9582cd880 100644 (file)
--- a/src/modules/proto_dhcpv4/proto_dhcpv4.c
+++ b/src/modules/proto_dhcpv4/proto_dhcpv4.c
@@ -71,7 +71,7 @@ static CONF_PARSER const proto_dhcpv4_config[] = {
 };
 
 
-static fr_dict_t const *dict_dhcpv4;
+static fr_dict_t *dict_dhcpv4;
 
 extern fr_dict_autoload_t proto_dhcpv4_dict[];
 fr_dict_autoload_t proto_dhcpv4_dict[] = {

diff --git a/src/modules/proto_dhcpv4/proto_dhcpv4_base.c b/src/modules/proto_dhcpv4/proto_dhcpv4_base.c
index 64d3b3d887b46b6659426830e0ffad50b6f226c1..e749c5e44085b7618ca1409b84a6e3db7d86811e 100644 (file)
--- a/src/modules/proto_dhcpv4/proto_dhcpv4_base.c
+++ b/src/modules/proto_dhcpv4/proto_dhcpv4_base.c
@@ -31,7 +31,7 @@
 #include <freeradius-devel/dhcpv4/dhcpv4.h>
 #include <freeradius-devel/dhcpv4.h>
 
-static fr_dict_t const *dict_dhcpv4;
+static fr_dict_t *dict_dhcpv4;
 
 extern fr_dict_autoload_t proto_dhcpv4_dict[];
 fr_dict_autoload_t proto_dhcpv4_dict[] = {

diff --git a/src/modules/proto_ldap_sync/proto_ldap_sync.c b/src/modules/proto_ldap_sync/proto_ldap_sync.c
index 718579c0be00559084d9d7958a4db8d97536c5fd..2be33d6446a9a6e3bf64beb8ef54444198af0205 100644 (file)
--- a/src/modules/proto_ldap_sync/proto_ldap_sync.c
+++ b/src/modules/proto_ldap_sync/proto_ldap_sync.c
@@ -195,7 +195,7 @@ static const CONF_PARSER module_config[] = {
        CONF_PARSER_TERMINATOR
 };
 
-static fr_dict_t const *dict_freeradius;
+static fr_dict_t *dict_freeradius;
 
 extern fr_dict_autoload_t proto_ldap_sync_dict[];
 fr_dict_autoload_t proto_ldap_sync_dict[] = {

diff --git a/src/modules/proto_ldap_sync/sync_touch.c b/src/modules/proto_ldap_sync/sync_touch.c
index 0a927f0ac7095f9404124f5b6a477ed9e9e0efe1..f7409dc52058bf63e39a8cbe0ffd7575ec87c31e 100644 (file)
--- a/src/modules/proto_ldap_sync/sync_touch.c
+++ b/src/modules/proto_ldap_sync/sync_touch.c
@@ -142,8 +142,8 @@ int main(int argc, char **argv)
                exit(EXIT_FAILURE);
        }
 
-       if (fr_dict_read(conf->raddb_dir, FR_DICTIONARY_FILE) == -1) {
-               fr_log_perror(&default_log, L_ERR, "Failed to initialize the dictionaries");
+       if (fr_dict_read(dict_freeradius, conf->raddb_dir, FR_DICTIONARY_FILE) == -1) {
+               fr_perror("sync_touch");
                exit(EXIT_FAILURE);
        }
        fr_strerror();  /* Clear the error buffer */

diff --git a/src/modules/proto_radius/proto_radius.c b/src/modules/proto_radius/proto_radius.c
index a3af2ded2ea559a2f2b7652d40f2c2cdd292ceaa..8300bf830dd2e78c5c43a267832a83dcc8f5f0a7 100644 (file)
--- a/src/modules/proto_radius/proto_radius.c
+++ b/src/modules/proto_radius/proto_radius.c
@@ -73,7 +73,7 @@ static CONF_PARSER const proto_radius_config[] = {
 };
 
 
-static fr_dict_t const *dict_radius;
+static fr_dict_t *dict_radius;
 
 extern fr_dict_autoload_t proto_radius_dict[];
 fr_dict_autoload_t proto_radius_dict[] = {

diff --git a/src/modules/proto_radius/proto_radius_acct.c b/src/modules/proto_radius/proto_radius_acct.c
index 0a5908f612fa8a1a46d13f787e743014a670cd57..3ab8fdf4edd81fadca5e401e4fdcb621b373d402 100644 (file)
--- a/src/modules/proto_radius/proto_radius_acct.c
+++ b/src/modules/proto_radius/proto_radius_acct.c
@@ -30,7 +30,7 @@
 #include <freeradius-devel/state.h>
 #include <freeradius-devel/rad_assert.h>
 
-static fr_dict_t const *dict_freeradius;
+static fr_dict_t *dict_freeradius;
 
 extern fr_dict_autoload_t proto_radius_acct_dict[];
 fr_dict_autoload_t proto_radius_acct_dict[] = {

diff --git a/src/modules/proto_radius/proto_radius_auth.c b/src/modules/proto_radius/proto_radius_auth.c
index c54aa443212eb3dbe1499b53bf0ed05dc68be8a8..66d5f792e68d846fc40d660981683a1233698e12 100644 (file)
--- a/src/modules/proto_radius/proto_radius_auth.c
+++ b/src/modules/proto_radius/proto_radius_auth.c
@@ -34,8 +34,8 @@
 #define USEC (1000000)
 #endif
 
-static fr_dict_t const *dict_freeradius;
-static fr_dict_t const *dict_radius;
+static fr_dict_t *dict_freeradius;
+static fr_dict_t *dict_radius;
 
 extern fr_dict_autoload_t proto_radius_auth_dict[];
 fr_dict_autoload_t proto_radius_auth_dict[] = {

diff --git a/src/modules/proto_radius/proto_radius_coa.c b/src/modules/proto_radius/proto_radius_coa.c
index cfc93e170e88f0d5b8871a9a561daacf7ee1f9f2..c6fe92e35d34c082080b8df03a9ee4de6327320f 100644 (file)
--- a/src/modules/proto_radius/proto_radius_coa.c
+++ b/src/modules/proto_radius/proto_radius_coa.c
@@ -29,7 +29,7 @@
 #include <freeradius-devel/dict.h>
 #include <freeradius-devel/rad_assert.h>
 
-static fr_dict_t const *dict_freeradius;
+static fr_dict_t *dict_freeradius;
 
 extern fr_dict_autoload_t proto_radius_coa_dict[];
 fr_dict_autoload_t proto_radius_coa_dict[] = {

diff --git a/src/modules/proto_radius/proto_radius_dynamic_client.c b/src/modules/proto_radius/proto_radius_dynamic_client.c
index 82db41776e04a65405d526e7d71b1930cff72810..3f273133f5af66d5e1aa51d01be963e24a7efc4d 100644 (file)
--- a/src/modules/proto_radius/proto_radius_dynamic_client.c
+++ b/src/modules/proto_radius/proto_radius_dynamic_client.c
@@ -29,7 +29,7 @@
 #include <freeradius-devel/dict.h>
 #include <freeradius-devel/rad_assert.h>
 
-static fr_dict_t const *dict_freeradius;
+static fr_dict_t *dict_freeradius;
 
 extern fr_dict_autoload_t proto_radius_dynamic_client_dict[];
 fr_dict_autoload_t proto_radius_dynamic_client_dict[] = {

diff --git a/src/modules/proto_radius/proto_radius_status.c b/src/modules/proto_radius/proto_radius_status.c
index 6b3d8d2e223c565bfc853996c6d08989f0689ac2..a493e133c23aba6a72c112aa87420364e3211308 100644 (file)
--- a/src/modules/proto_radius/proto_radius_status.c
+++ b/src/modules/proto_radius/proto_radius_status.c
@@ -29,7 +29,7 @@
 #include <freeradius-devel/dict.h>
 #include <freeradius-devel/rad_assert.h>
 
-static fr_dict_t const *dict_freeradius;
+static fr_dict_t *dict_freeradius;
 
 extern fr_dict_autoload_t proto_radius_status_dict[];
 fr_dict_autoload_t proto_radius_status_dict[] = {

diff --git a/src/modules/proto_tacacs/proto_tacacs.c b/src/modules/proto_tacacs/proto_tacacs.c
index ac3601b435d4f7621f81e77485c92bc5baa7c082..538dcad7b787ec5bc6dbf1ff6db66e57e8cc8e2e 100644 (file)
--- a/src/modules/proto_tacacs/proto_tacacs.c
+++ b/src/modules/proto_tacacs/proto_tacacs.c
@@ -30,9 +30,9 @@
 
 #include <freeradius-devel/tacacs/tacacs.h>
 
-static fr_dict_t const *dict_freeradius;
-static fr_dict_t const *dict_radius;
-static fr_dict_t const *dict_tacacs;
+static fr_dict_t *dict_freeradius;
+static fr_dict_t *dict_radius;
+static fr_dict_t *dict_tacacs;
 
 extern fr_dict_autoload_t proto_tacacs_dict[];
 fr_dict_autoload_t proto_tacacs_dict[] = {

diff --git a/src/modules/proto_vmps/proto_vmps.c b/src/modules/proto_vmps/proto_vmps.c
index ab939f9f5456f7c8b1dedf9fc5c5b16c1fd218c4..1792fd9fddbcbb39aee08f4cdf66ee3f88b3b196 100644 (file)
--- a/src/modules/proto_vmps/proto_vmps.c
+++ b/src/modules/proto_vmps/proto_vmps.c
@@ -83,7 +83,7 @@ static const CONF_PARSER priority_config[] = {
        CONF_PARSER_TERMINATOR
 };
 
-static fr_dict_t const *dict_vmps;
+static fr_dict_t *dict_vmps;
 
 extern fr_dict_autoload_t proto_vmps_dict[];
 fr_dict_autoload_t proto_vmps_dict[] = {

diff --git a/src/modules/proto_vmps/vqp.h b/src/modules/proto_vmps/vqp.h
index 16a9255e5d9687d3f64a421b1d3a180c1ad50f3a..2a8ef5d764a5301e6867b292b4fa6bfad1214969 100644 (file)
--- a/src/modules/proto_vmps/vqp.h
+++ b/src/modules/proto_vmps/vqp.h
@@ -31,7 +31,7 @@ RCSIDH(vqp_h, "$Id$")
 extern "C" {
 #endif
 
-extern fr_dict_t const *dict_vqp;
+extern fr_dict_t *dict_vqp;
 
 #define FR_MAX_VMPS_CODE (5)
 

diff --git a/src/modules/rlm_attr_filter/rlm_attr_filter.c b/src/modules/rlm_attr_filter/rlm_attr_filter.c
index d16af23ba0f321260c355edd1c6075c696678c58..63649fdc983a07d74c56acf75ce888aab997ab00 100644 (file)
--- a/src/modules/rlm_attr_filter/rlm_attr_filter.c
+++ b/src/modules/rlm_attr_filter/rlm_attr_filter.c
@@ -51,8 +51,8 @@ static const CONF_PARSER module_config[] = {
        CONF_PARSER_TERMINATOR
 };
 
-static fr_dict_t const *dict_freeradius;
-static fr_dict_t const *dict_radius;
+static fr_dict_t *dict_freeradius;
+static fr_dict_t *dict_radius;
 
 extern fr_dict_autoload_t rlm_attr_filter_dict[];
 fr_dict_autoload_t rlm_attr_filter_dict[] = {

diff --git a/src/modules/rlm_cache/rlm_cache.c b/src/modules/rlm_cache/rlm_cache.c
index 3404e13845dbf43020958f631d32f5db5d0b737c..7de0cb3b1103f655444256550d330d5445efbdfc 100644 (file)
--- a/src/modules/rlm_cache/rlm_cache.c
+++ b/src/modules/rlm_cache/rlm_cache.c
@@ -48,7 +48,7 @@ static const CONF_PARSER module_config[] = {
        CONF_PARSER_TERMINATOR
 };
 
-static fr_dict_t const *dict_freeradius;
+static fr_dict_t *dict_freeradius;
 
 extern fr_dict_autoload_t rlm_cache_dict[];
 fr_dict_autoload_t rlm_cache_dict[] = {

diff --git a/src/modules/rlm_chap/rlm_chap.c b/src/modules/rlm_chap/rlm_chap.c
index d84e64bfe51fec40846ac18ec7130dc683f8857b..2b96dc5dc0bedb441fcd2d51ab3dc6aa0ffd2057 100644 (file)
--- a/src/modules/rlm_chap/rlm_chap.c
+++ b/src/modules/rlm_chap/rlm_chap.c
@@ -32,8 +32,8 @@ typedef struct {
        fr_dict_enum_t          *auth_type;
 } rlm_chap_t;
 
-static fr_dict_t const *dict_freeradius;
-static fr_dict_t const *dict_radius;
+static fr_dict_t *dict_freeradius;
+static fr_dict_t *dict_radius;
 
 extern fr_dict_autoload_t rlm_chap_dict[];
 fr_dict_autoload_t rlm_chap_dict[] = {

diff --git a/src/modules/rlm_couchbase/rlm_couchbase.c b/src/modules/rlm_couchbase/rlm_couchbase.c
index 4dd24e504ffc2a9076b3ade5ea6268ab6b0dd346..7fd34956cdafab86eab4c768d1004467abd98df3 100644 (file)
--- a/src/modules/rlm_couchbase/rlm_couchbase.c
+++ b/src/modules/rlm_couchbase/rlm_couchbase.c
@@ -65,7 +65,7 @@ static const CONF_PARSER module_config[] = {
        CONF_PARSER_TERMINATOR
 };
 
-static fr_dict_t const *dict_radius;
+static fr_dict_t *dict_radius;
 
 extern fr_dict_autoload_t rlm_couchbase_dict[];
 fr_dict_autoload_t rlm_couchbase_dict[] = {

diff --git a/src/modules/rlm_cram/rlm_cram.c b/src/modules/rlm_cram/rlm_cram.c
index 022dd9220ebd119960e9f0dc0b7cc680c7bb2b8b..e8f958d9512ebe4b22a4b2c85a327ed52cd1fafe 100644 (file)
--- a/src/modules/rlm_cram/rlm_cram.c
+++ b/src/modules/rlm_cram/rlm_cram.c
@@ -44,8 +44,8 @@ RCSID("$Id$")
 
 #include <ctype.h>
 
-static fr_dict_t const *dict_freeradius;
-static fr_dict_t const *dict_radius;
+static fr_dict_t *dict_freeradius;
+static fr_dict_t *dict_radius;
 
 extern fr_dict_autoload_t rlm_cram_dict[];
 fr_dict_autoload_t rlm_cram_dict[] = {

diff --git a/src/modules/rlm_detail/rlm_detail.c b/src/modules/rlm_detail/rlm_detail.c
index a714e251fed8768f66087ce5fc8b5b4ed8b523ed..ee43c7e00198e0a397353f3c976b8faae81801a6 100644 (file)
--- a/src/modules/rlm_detail/rlm_detail.c
+++ b/src/modules/rlm_detail/rlm_detail.c
@@ -80,8 +80,8 @@ static const CONF_PARSER module_config[] = {
        CONF_PARSER_TERMINATOR
 };
 
-static fr_dict_t const *dict_freeradius;
-static fr_dict_t const *dict_radius;
+static fr_dict_t *dict_freeradius;
+static fr_dict_t *dict_radius;
 
 extern fr_dict_autoload_t rlm_detail_dict[];
 fr_dict_autoload_t rlm_detail_dict[] = {

diff --git a/src/modules/rlm_digest/rlm_digest.c b/src/modules/rlm_digest/rlm_digest.c
index 57b517bcc1d8375b679971d33240a2684bc173eb..14561b4804c601eb1bb6fcce77e51412b30b3930 100644 (file)
--- a/src/modules/rlm_digest/rlm_digest.c
+++ b/src/modules/rlm_digest/rlm_digest.c
@@ -28,8 +28,8 @@ RCSID("$Id$")
 #include <freeradius-devel/modules.h>
 #include <freeradius-devel/md5.h>
 
-static fr_dict_t const *dict_freeradius;
-static fr_dict_t const *dict_radius;
+static fr_dict_t *dict_freeradius;
+static fr_dict_t *dict_radius;
 
 extern fr_dict_autoload_t rlm_digest_dict[];
 fr_dict_autoload_t rlm_digest_dict[] = {

diff --git a/src/modules/rlm_eap/lib/base/eap_base.c b/src/modules/rlm_eap/lib/base/eap_base.c
index d18d74532d75a7d15aa77968783712524e51bf6a..ee1c076b718fc38f9409ab1b5128d80570dcc4c2 100644 (file)
--- a/src/modules/rlm_eap/lib/base/eap_base.c
+++ b/src/modules/rlm_eap/lib/base/eap_base.c
@@ -67,8 +67,8 @@ RCSID("$Id$")
 #include "eap_attrs.h"
 #include "eap.h"
 
-static fr_dict_t const *dict_freeradius;
-static fr_dict_t const *dict_radius;
+static fr_dict_t *dict_freeradius;
+static fr_dict_t *dict_radius;
 
 extern fr_dict_autoload_t eap_base_dict[];
 fr_dict_autoload_t eap_base_dict[] = {

diff --git a/src/modules/rlm_eap/rlm_eap.c b/src/modules/rlm_eap/rlm_eap.c
index f66150795c9afc369a29207aaca4e91fe4ff8764..c89708cc1f1a9988bae056bd7cced1f1782937bb 100644 (file)
--- a/src/modules/rlm_eap/rlm_eap.c
+++ b/src/modules/rlm_eap/rlm_eap.c
@@ -63,8 +63,8 @@ static const CONF_PARSER module_config[] = {
        CONF_PARSER_TERMINATOR
 };
 
-static fr_dict_t const *dict_freeradius;
-static fr_dict_t const *dict_radius;
+static fr_dict_t *dict_freeradius;
+static fr_dict_t *dict_radius;
 
 extern fr_dict_autoload_t rlm_eap_dict[];
 fr_dict_autoload_t rlm_eap_dict[] = {

diff --git a/src/modules/rlm_eap/types/rlm_eap_aka/rlm_eap_aka.c b/src/modules/rlm_eap/types/rlm_eap_aka/rlm_eap_aka.c
index 382db416c9b8a5c5e76e6a6f0b875993d5cde35d..a5e7efb0877aa12864f2966a39015e2ded4fc48a 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_aka/rlm_eap_aka.c
+++ b/src/modules/rlm_eap/types/rlm_eap_aka/rlm_eap_aka.c
@@ -57,9 +57,9 @@ static CONF_PARSER submodule_config[] = {
        CONF_PARSER_TERMINATOR
 };
 
-static fr_dict_t const *dict_freeradius;
-static fr_dict_t const *dict_radius;
-static fr_dict_t const *dict_eap_aka;
+static fr_dict_t *dict_freeradius;
+static fr_dict_t *dict_radius;
+static fr_dict_t *dict_eap_aka;
 
 extern fr_dict_autoload_t rlm_eap_aka_dict[];
 fr_dict_autoload_t rlm_eap_aka_dict[] = {

diff --git a/src/modules/rlm_eap/types/rlm_eap_fast/rlm_eap_fast.c b/src/modules/rlm_eap/types/rlm_eap_fast/rlm_eap_fast.c
index f0692403c18d899a24958728d2413a26195441fc..71cc3f0f0c1ba56e55f27cd99b78119fca428ff6 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_fast/rlm_eap_fast.c
+++ b/src/modules/rlm_eap/types/rlm_eap_fast/rlm_eap_fast.c
@@ -73,9 +73,9 @@ static CONF_PARSER submodule_config[] = {
        CONF_PARSER_TERMINATOR
 };
 
-static fr_dict_t const *dict_freeradius;
-static fr_dict_t const *dict_radius;
-static fr_dict_t const *dict_eap_fast;
+static fr_dict_t *dict_freeradius;
+static fr_dict_t *dict_radius;
+static fr_dict_t *dict_eap_fast;
 
 extern fr_dict_autoload_t rlm_eap_fast_dict[];
 fr_dict_autoload_t rlm_eap_fast_dict[] = {

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 ae164a48afb0e7d89ad32a987fb079fdd12b42eb..746237daf0949e6d85e7c72a4c0cea5923167520 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
@@ -51,8 +51,8 @@ static CONF_PARSER submodule_config[] = {
        CONF_PARSER_TERMINATOR
 };
 
-static fr_dict_t const *dict_freeradius;
-static fr_dict_t const *dict_radius;
+static fr_dict_t *dict_freeradius;
+static fr_dict_t *dict_radius;
 
 extern fr_dict_autoload_t rlm_eap_gtc_dict[];
 fr_dict_autoload_t rlm_eap_gtc_dict[] = {

diff --git a/src/modules/rlm_eap/types/rlm_eap_leap/rlm_eap_leap.c b/src/modules/rlm_eap/types/rlm_eap_leap/rlm_eap_leap.c
index 8b70b53a2e739d138fbbafb8d8081153a1fdf0dc..7e45c99e3a5c4975c3e3e1d66d590595e4df1c87 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_leap/rlm_eap_leap.c
+++ b/src/modules/rlm_eap/types/rlm_eap_leap/rlm_eap_leap.c
@@ -28,8 +28,8 @@ RCSID("$Id$")
 
 #include "eap_leap.h"
 
-static fr_dict_t const *dict_freeradius;
-static fr_dict_t const *dict_radius;
+static fr_dict_t *dict_freeradius;
+static fr_dict_t *dict_radius;
 
 extern fr_dict_autoload_t rlm_eap_leap_dict[];
 fr_dict_autoload_t rlm_eap_leap_dict[] = {

diff --git a/src/modules/rlm_eap/types/rlm_eap_md5/rlm_eap_md5.c b/src/modules/rlm_eap/types/rlm_eap_md5/rlm_eap_md5.c
index f50afafddd0f57b6b5c7688645ff415673e55573..d3896969d3780607a9da73465115e0b897dc8d1b 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_md5/rlm_eap_md5.c
+++ b/src/modules/rlm_eap/types/rlm_eap_md5/rlm_eap_md5.c
@@ -31,7 +31,7 @@ RCSID("$Id$")
 #include <freeradius-devel/rad_assert.h>
 #include <freeradius-devel/md5.h>
 
-static fr_dict_t const *dict_freeradius;
+static fr_dict_t *dict_freeradius;
 
 extern fr_dict_autoload_t rlm_eap_md5_dict[];
 fr_dict_autoload_t rlm_eap_md5_dict[] = {

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 4facab34c61ee747719b46192ee90637ddbf18fa..ef3e0cdeb7ccf376cc297885a20f74fba7bad76e 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
@@ -48,8 +48,8 @@ static CONF_PARSER submodule_config[] = {
        CONF_PARSER_TERMINATOR
 };
 
-static fr_dict_t const *dict_freeradius;
-static fr_dict_t const *dict_radius;
+static fr_dict_t *dict_freeradius;
+static fr_dict_t *dict_radius;
 
 extern fr_dict_autoload_t rlm_eap_mschapv2_dict[];
 fr_dict_autoload_t rlm_eap_mschapv2_dict[] = {

diff --git a/src/modules/rlm_eap/types/rlm_eap_peap/rlm_eap_peap.c b/src/modules/rlm_eap/types/rlm_eap_peap/rlm_eap_peap.c
index 34f5aafa5f29b6740275a5ef2de74626b319c6dd..8d89f511923e058f0e30868f14d3f644413410df 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_peap/rlm_eap_peap.c
+++ b/src/modules/rlm_eap/types/rlm_eap_peap/rlm_eap_peap.c
@@ -73,8 +73,8 @@ static CONF_PARSER submodule_config[] = {
        CONF_PARSER_TERMINATOR
 };
 
-static fr_dict_t const *dict_freeradius;
-static fr_dict_t const *dict_radius;
+static fr_dict_t *dict_freeradius;
+static fr_dict_t *dict_radius;
 
 extern fr_dict_autoload_t rlm_eap_peap_dict[];
 fr_dict_autoload_t rlm_eap_peap_dict[] = {

diff --git a/src/modules/rlm_eap/types/rlm_eap_pwd/rlm_eap_pwd.c b/src/modules/rlm_eap/types/rlm_eap_pwd/rlm_eap_pwd.c
index 44a0fc16a3e74327c1a0d9f1fefa93e96f1ddf64..0fb66a83462e3c9db49e19f1bf1d976e89bfad32 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_pwd/rlm_eap_pwd.c
+++ b/src/modules/rlm_eap/types/rlm_eap_pwd/rlm_eap_pwd.c
@@ -60,8 +60,8 @@ static CONF_PARSER submodule_config[] = {
        CONF_PARSER_TERMINATOR
 };
 
-static fr_dict_t const *dict_freeradius;
-static fr_dict_t const *dict_radius;
+static fr_dict_t *dict_freeradius;
+static fr_dict_t *dict_radius;
 
 extern fr_dict_autoload_t rlm_eap_pwd_dict[];
 fr_dict_autoload_t rlm_eap_pwd_dict[] = {

diff --git a/src/modules/rlm_eap/types/rlm_eap_sim/rlm_eap_sim.c b/src/modules/rlm_eap/types/rlm_eap_sim/rlm_eap_sim.c
index 2df308dfda2714eec987142de011875a593de114..6ec906278329dea9a9e58df020b97f549bac20f1 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_sim/rlm_eap_sim.c
+++ b/src/modules/rlm_eap/types/rlm_eap_sim/rlm_eap_sim.c
@@ -56,9 +56,9 @@ static CONF_PARSER submodule_config[] = {
        CONF_PARSER_TERMINATOR
 };
 
-static fr_dict_t const *dict_freeradius;
-static fr_dict_t const *dict_radius;
-static fr_dict_t const *dict_eap_sim;
+static fr_dict_t *dict_freeradius;
+static fr_dict_t *dict_radius;
+static fr_dict_t *dict_eap_sim;
 
 extern fr_dict_autoload_t rlm_eap_sim_dict[];
 fr_dict_autoload_t rlm_eap_sim_dict[] = {

diff --git a/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c b/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c
index dffc082e79dd069cbaa6b7ff3c0321902ac0cd62..ff12ac032be0b179a006397c469d5e5bbb4d025b 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c
+++ b/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c
@@ -52,7 +52,7 @@ static CONF_PARSER submodule_config[] = {
        CONF_PARSER_TERMINATOR
 };
 
-static fr_dict_t const *dict_freeradius;
+static fr_dict_t *dict_freeradius;
 
 extern fr_dict_autoload_t rlm_eap_tls_dict[];
 fr_dict_autoload_t rlm_eap_tls_dict[] = {

diff --git a/src/modules/rlm_eap/types/rlm_eap_ttls/rlm_eap_ttls.c b/src/modules/rlm_eap/types/rlm_eap_ttls/rlm_eap_ttls.c
index adf0ddec4e0e1a118c722bcc0bb23f62445989b0..5c85a7f33bda4a716038a7eba63ba7848778332e 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_ttls/rlm_eap_ttls.c
+++ b/src/modules/rlm_eap/types/rlm_eap_ttls/rlm_eap_ttls.c
@@ -68,8 +68,8 @@ static CONF_PARSER submodule_config[] = {
        CONF_PARSER_TERMINATOR
 };
 
-static fr_dict_t const *dict_freeradius;
-static fr_dict_t const *dict_radius;
+static fr_dict_t *dict_freeradius;
+static fr_dict_t *dict_radius;
 
 extern fr_dict_autoload_t rlm_eap_ttls_dict[];
 fr_dict_autoload_t rlm_eap_ttls_dict[] = {

diff --git a/src/modules/rlm_example/rlm_example.c b/src/modules/rlm_example/rlm_example.c
index d9581d42b792baee0698f92f1b2815e5b6809d5e..b7596dbb89765f22706a567a10cacf8240b9194c 100644 (file)
--- a/src/modules/rlm_example/rlm_example.c
+++ b/src/modules/rlm_example/rlm_example.c
@@ -53,7 +53,7 @@ static const CONF_PARSER module_config[] = {
        CONF_PARSER_TERMINATOR
 };
 
-static fr_dict_t const *dict_radius;
+static fr_dict_t *dict_radius;
 
 extern fr_dict_autoload_t rlm_example_dict[];
 fr_dict_autoload_t rlm_example_dict[] = {

diff --git a/src/modules/rlm_expiration/rlm_expiration.c b/src/modules/rlm_expiration/rlm_expiration.c
index 658e74170c4d8e21e04517fada3763abd74ffb86..409bfbf1fa9d20ca0cd8132409bc697f2dde4a78 100644 (file)
--- a/src/modules/rlm_expiration/rlm_expiration.c
+++ b/src/modules/rlm_expiration/rlm_expiration.c
@@ -29,8 +29,8 @@ RCSID("$Id$")
 
 #include <ctype.h>
 
-static fr_dict_t const *dict_freeradius;
-static fr_dict_t const *dict_radius;
+static fr_dict_t *dict_freeradius;
+static fr_dict_t *dict_radius;
 
 extern fr_dict_autoload_t rlm_expiration_dict[];
 fr_dict_autoload_t rlm_expiration_dict[] = {

diff --git a/src/modules/rlm_files/rlm_files.c b/src/modules/rlm_files/rlm_files.c
index 63d172f47b3284543e29bde948d8e69cf9eb588b..d0539c3db39451c7b0e95adc3ef83c272ff57f4b 100644 (file)
--- a/src/modules/rlm_files/rlm_files.c
+++ b/src/modules/rlm_files/rlm_files.c
@@ -64,7 +64,7 @@ typedef struct rlm_files_t {
        rbtree_t *postauth_users;
 } rlm_files_t;
 
-static fr_dict_t const *dict_freeradius;
+static fr_dict_t *dict_freeradius;
 
 extern fr_dict_autoload_t rlm_files_dict[];
 fr_dict_autoload_t rlm_files_dict[] = {

diff --git a/src/modules/rlm_ldap/rlm_ldap.c b/src/modules/rlm_ldap/rlm_ldap.c
index 91c6c1cc22c4637022d7b6467021d94b54b3fca8..1534b4dbba16ada9e3edc8796960950d7d0db0fe 100644 (file)
--- a/src/modules/rlm_ldap/rlm_ldap.c
+++ b/src/modules/rlm_ldap/rlm_ldap.c
@@ -223,8 +223,8 @@ static const CONF_PARSER module_config[] = {
        CONF_PARSER_TERMINATOR
 };
 
-static fr_dict_t const *dict_freeradius;
-static fr_dict_t const *dict_radius;
+static fr_dict_t *dict_freeradius;
+static fr_dict_t *dict_radius;
 
 extern fr_dict_autoload_t rlm_ldap_dict[];
 fr_dict_autoload_t rlm_ldap_dict[] = {
@@ -1486,12 +1486,9 @@ static int mod_bootstrap(void *instance, CONF_SECTION *conf)
         */
        if (inst->cache_attribute) {
                fr_dict_attr_flags_t    flags;
-               fr_dict_t               *mutable;
-
-               memcpy(&mutable, &dict_freeradius, sizeof(mutable));
 
                memset(&flags, 0, sizeof(flags));
-               if (fr_dict_attr_add(mutable, fr_dict_root(mutable),
+               if (fr_dict_attr_add(dict_freeradius, fr_dict_root(dict_freeradius),
                                     inst->cache_attribute, -1, FR_TYPE_STRING, &flags) < 0) {
                        PERROR("Error creating cache attribute");
                error:

diff --git a/src/modules/rlm_logintime/rlm_logintime.c b/src/modules/rlm_logintime/rlm_logintime.c
index 70822fd113f4b3b9ee1696f92a8eb53a64a26db3..7b8820ea01b9cee69b20f7da5ac1558e4b408558 100644 (file)
--- a/src/modules/rlm_logintime/rlm_logintime.c
+++ b/src/modules/rlm_logintime/rlm_logintime.c
@@ -48,8 +48,8 @@ static const CONF_PARSER module_config[] = {
        CONF_PARSER_TERMINATOR
 };
 
-static fr_dict_t const *dict_freeradius;
-static fr_dict_t const *dict_radius;
+static fr_dict_t *dict_freeradius;
+static fr_dict_t *dict_radius;
 
 extern fr_dict_autoload_t rlm_logintime_dict[];
 fr_dict_autoload_t rlm_logintime_dict[] = {

diff --git a/src/modules/rlm_mschap/rlm_mschap.c b/src/modules/rlm_mschap/rlm_mschap.c
index 0f0254657957b17fe85b272cab2e35f38b5d8692..28fac480b85e1fda90d0b1d50efeaa5335b462d6 100644 (file)
--- a/src/modules/rlm_mschap/rlm_mschap.c
+++ b/src/modules/rlm_mschap/rlm_mschap.c
@@ -96,8 +96,8 @@ static const CONF_PARSER module_config[] = {
        CONF_PARSER_TERMINATOR
 };
 
-static fr_dict_t const *dict_freeradius;
-static fr_dict_t const *dict_radius;
+static fr_dict_t *dict_freeradius;
+static fr_dict_t *dict_radius;
 
 extern fr_dict_autoload_t rlm_expiration_dict[];
 fr_dict_autoload_t rlm_expiration_dict[] = {

diff --git a/src/modules/rlm_pap/rlm_pap.c b/src/modules/rlm_pap/rlm_pap.c
index c49667c98ce8694ede12c799bace3849d4e48a42..c977f66e341bf3a1f95dc8144fa67dd65286f898 100644 (file)
--- a/src/modules/rlm_pap/rlm_pap.c
+++ b/src/modules/rlm_pap/rlm_pap.c
@@ -59,8 +59,8 @@ static const CONF_PARSER module_config[] = {
        CONF_PARSER_TERMINATOR
 };
 
-static fr_dict_t const *dict_freeradius;
-static fr_dict_t const *dict_radius;
+static fr_dict_t *dict_freeradius;
+static fr_dict_t *dict_radius;
 
 extern fr_dict_autoload_t rlm_pap_dict[];
 fr_dict_autoload_t rlm_pap_dict[] = {

diff --git a/src/modules/rlm_radius/rlm_radius.c b/src/modules/rlm_radius/rlm_radius.c
index 6748ceca8e4c8a7a0426d6e648f9ba5189eb6d92..5e72077e7b2d7844ed284113767251c8e07365ca 100644 (file)
--- a/src/modules/rlm_radius/rlm_radius.c
+++ b/src/modules/rlm_radius/rlm_radius.c
@@ -147,7 +147,7 @@ static CONF_PARSER const type_interval_config[FR_MAX_PACKET_CODE] = {
        [FR_CODE_DISCONNECT_REQUEST] = { FR_CONF_POINTER("Disconnect-Request", FR_TYPE_SUBSECTION, NULL), .subcs = (void const *) disconnect_config },
 };
 
-static fr_dict_t const *dict_radius;
+static fr_dict_t *dict_radius;
 
 extern fr_dict_autoload_t rlm_radius_dict[];
 fr_dict_autoload_t rlm_radius_dict[] = {

diff --git a/src/modules/rlm_radius/rlm_radius_udp.c b/src/modules/rlm_radius/rlm_radius_udp.c
index 5a5ee4cce12413fd9418d8b2175a6290fe7d524e..0b1698dba067e67689e28c016f5657cd16dc7d54 100644 (file)
--- a/src/modules/rlm_radius/rlm_radius_udp.c
+++ b/src/modules/rlm_radius/rlm_radius_udp.c
@@ -192,7 +192,7 @@ static const CONF_PARSER module_config[] = {
        CONF_PARSER_TERMINATOR
 };
 
-static fr_dict_t const *dict_radius;
+static fr_dict_t *dict_radius;
 
 extern fr_dict_autoload_t rlm_radius_udp_dict[];
 fr_dict_autoload_t rlm_radius_udp_dict[] = {

diff --git a/src/modules/rlm_rest/rest.h b/src/modules/rlm_rest/rest.h
index 55b9c4636b04b50d5936a0edd9f5106bbb56845d..9f0547624cad77e4a9f570bc86afd40d4cb850ca 100644 (file)
--- a/src/modules/rlm_rest/rest.h
+++ b/src/modules/rlm_rest/rest.h
@@ -265,7 +265,7 @@ typedef struct {
        rlm_rest_handle_t               *handle;        //!< curl easy handle servicing our request.
 } rlm_rest_xlat_rctx_t;
 
-extern fr_dict_t const *dict_freeradius;
+extern fr_dict_t *dict_freeradius;
 
 extern fr_dict_attr_t const *attr_rest_http_body;
 extern fr_dict_attr_t const *attr_rest_http_header;

diff --git a/src/modules/rlm_rest/rlm_rest.c b/src/modules/rlm_rest/rlm_rest.c
index d2cc7da82f8da6ea9dc2c4afc27a93193a99d26e..1882090aa2b213f3e29df218a953e8d947e45e10 100644 (file)
--- a/src/modules/rlm_rest/rlm_rest.c
+++ b/src/modules/rlm_rest/rlm_rest.c
@@ -95,7 +95,7 @@ static const CONF_PARSER module_config[] = {
        CONF_PARSER_TERMINATOR
 };
 
-fr_dict_t const *dict_freeradius;
+fr_dict_t *dict_freeradius;
 
 extern fr_dict_autoload_t rlm_rest_dict[];
 fr_dict_autoload_t rlm_rest_dict[] = {

diff --git a/src/modules/rlm_securid/rlm_securid.c b/src/modules/rlm_securid/rlm_securid.c
index 9e6a0724398c8cc7030802949d885ab9f1bc1d90..e4d2fc305119a41cc2107a5cf6e689c41e5dc722 100644 (file)
--- a/src/modules/rlm_securid/rlm_securid.c
+++ b/src/modules/rlm_securid/rlm_securid.c
@@ -49,7 +49,7 @@ static const CONF_PARSER module_config[] = {
        CONF_PARSER_TERMINATOR
 };
 
-static fr_dict_t const *dict_radius;
+static fr_dict_t *dict_radius;
 
 extern fr_dict_autoload_t mem_dict[];
 fr_dict_autoload_t mem_dict[] = {

diff --git a/src/modules/rlm_soh/rlm_soh.c b/src/modules/rlm_soh/rlm_soh.c
index 0966052aff0bb025c7293b0fc0763f7e71c9ad7d..f25af3e86a2b83222d3b3a2bfc4b57460d6f9a86 100644 (file)
--- a/src/modules/rlm_soh/rlm_soh.c
+++ b/src/modules/rlm_soh/rlm_soh.c
@@ -33,8 +33,8 @@ typedef struct rlm_soh_t {
        bool dhcp;
 } rlm_soh_t;
 
-static fr_dict_t const *dict_freeradius;
-static fr_dict_t const *dict_radius;
+static fr_dict_t *dict_freeradius;
+static fr_dict_t *dict_radius;
 
 extern fr_dict_autoload_t rlm_soh_dict[];
 fr_dict_autoload_t rlm_soh_dict[] = {

diff --git a/src/modules/rlm_sql/rlm_sql.c b/src/modules/rlm_sql/rlm_sql.c
index 04303c8d88970124ffac9e0c101dff7f64ce1b4d..cea16f08e3d0acc9fc942c746cdffb2d6069aeff 100644 (file)
--- a/src/modules/rlm_sql/rlm_sql.c
+++ b/src/modules/rlm_sql/rlm_sql.c
@@ -115,8 +115,8 @@ static const CONF_PARSER module_config[] = {
        CONF_PARSER_TERMINATOR
 };
 
-static fr_dict_t const *dict_freeradius;
-static fr_dict_t const *dict_radius;
+static fr_dict_t *dict_freeradius;
+static fr_dict_t *dict_radius;
 
 extern fr_dict_autoload_t rlm_sql_dict[];
 fr_dict_autoload_t rlm_sql_dict[] = {

diff --git a/src/modules/rlm_sqlcounter/rlm_sqlcounter.c b/src/modules/rlm_sqlcounter/rlm_sqlcounter.c
index 13f712d45f2d5bd4cb4ed0a8c4648fbaa9479a3a..d4a8b6b4a50b4c7531af30d4251eba94a6b4cd40 100644 (file)
--- a/src/modules/rlm_sqlcounter/rlm_sqlcounter.c
+++ b/src/modules/rlm_sqlcounter/rlm_sqlcounter.c
@@ -91,7 +91,7 @@ static const CONF_PARSER module_config[] = {
        CONF_PARSER_TERMINATOR
 };
 
-static fr_dict_t const *dict_radius;
+static fr_dict_t *dict_radius;
 
 extern fr_dict_autoload_t rlm_sqlcounter_dict[];
 fr_dict_autoload_t rlm_sqlcounter_dict[] = {

diff --git a/src/modules/rlm_sqlhpwippool/rlm_sqlhpwippool.c b/src/modules/rlm_sqlhpwippool/rlm_sqlhpwippool.c
index e1822945e9c83a91f2e3fe783a4ab0aabcde383d..dceb11b038dc5c26a91f2a1c5db3c1ceadee1fe4 100644 (file)
--- a/src/modules/rlm_sqlhpwippool/rlm_sqlhpwippool.c
+++ b/src/modules/rlm_sqlhpwippool/rlm_sqlhpwippool.c
@@ -76,8 +76,8 @@ static CONF_PARSER module_config[] = {
        CONF_PARSER_TERMINATOR
 };
 
-static fr_dict_t const *dict_freeradius;
-static fr_dict_t const *dict_radius;
+static fr_dict_t *dict_freeradius;
+static fr_dict_t *dict_radius;
 
 extern fr_dict_autoload_t rlm_sqlhpwippool_dict[];
 fr_dict_autoload_t rlm_sqlhpwippool_dict[] = {

diff --git a/src/modules/rlm_sqlippool/rlm_sqlippool.c b/src/modules/rlm_sqlippool/rlm_sqlippool.c
index 413297035c03c6c7333c5002068cebc5bf43da6a..c4ab9fc5a85d6d42b0d0ce8a1cd7ee3e06a37c79 100644 (file)
--- a/src/modules/rlm_sqlippool/rlm_sqlippool.c
+++ b/src/modules/rlm_sqlippool/rlm_sqlippool.c
@@ -169,8 +169,8 @@ static CONF_PARSER module_config[] = {
        CONF_PARSER_TERMINATOR
 };
 
-static fr_dict_t const *dict_freeradius;
-static fr_dict_t const *dict_radius;
+static fr_dict_t *dict_freeradius;
+static fr_dict_t *dict_radius;
 
 extern fr_dict_autoload_t rlm_sqlippool_dict[];
 fr_dict_autoload_t rlm_sqlippool_dict[] = {

diff --git a/src/modules/rlm_stats/rlm_stats.c b/src/modules/rlm_stats/rlm_stats.c
index 6a49d00dcd3f28c392029fa386b5d852fdde9e13..1b495f3cb93d4e59d4d55ec714f4c52f52b5e25a 100644 (file)
--- a/src/modules/rlm_stats/rlm_stats.c
+++ b/src/modules/rlm_stats/rlm_stats.c
@@ -90,7 +90,7 @@ static const CONF_PARSER module_config[] = {
        CONF_PARSER_TERMINATOR
 };
 
-static fr_dict_t const *dict_radius;
+static fr_dict_t *dict_radius;
 
 extern fr_dict_autoload_t rlm_stats_dict[];
 fr_dict_autoload_t rlm_stats_dict[] = {

diff --git a/src/modules/rlm_test/rlm_test.c b/src/modules/rlm_test/rlm_test.c
index 56073d015d4b05d0130b1aebedf99daf9a8c1095..b608190998fd9c77e11eed6a0f56b91ca9f00c21 100644 (file)
--- a/src/modules/rlm_test/rlm_test.c
+++ b/src/modules/rlm_test/rlm_test.c
@@ -166,7 +166,7 @@ static const CONF_PARSER module_config[] = {
        CONF_PARSER_TERMINATOR
 };
 
-static fr_dict_t const *dict_radius;
+static fr_dict_t *dict_radius;
 
 extern fr_dict_autoload_t rlm_test_dict[];
 fr_dict_autoload_t rlm_test_dict[] = {

diff --git a/src/modules/rlm_unix/rlm_unix.c b/src/modules/rlm_unix/rlm_unix.c
index a7e707fe8d306bfbc03ab71009fde1b97ab8cf65..b605877078c8445d3139acc97bc6fa79c3c30922 100644 (file)
--- a/src/modules/rlm_unix/rlm_unix.c
+++ b/src/modules/rlm_unix/rlm_unix.c
@@ -71,8 +71,8 @@ static const CONF_PARSER module_config[] = {
        CONF_PARSER_TERMINATOR
 };
 
-static fr_dict_t const *dict_freeradius;
-static fr_dict_t const *dict_radius;
+static fr_dict_t *dict_freeradius;
+static fr_dict_t *dict_radius;
 
 extern fr_dict_autoload_t rlm_unix_dict[];
 fr_dict_autoload_t rlm_unix_dict[] = {

diff --git a/src/modules/rlm_wimax/rlm_wimax.c b/src/modules/rlm_wimax/rlm_wimax.c
index 8e977aab0ddf119628cbd091326bf6d173cd44e7..5b546b748e3498aee5ea893d1c5315e2cb1a70af 100644 (file)
--- a/src/modules/rlm_wimax/rlm_wimax.c
+++ b/src/modules/rlm_wimax/rlm_wimax.c
@@ -46,8 +46,8 @@ static const CONF_PARSER module_config[] = {
        CONF_PARSER_TERMINATOR
 };
 
-static fr_dict_t const *dict_radius;
-static fr_dict_t const *dict_freeradius;
+static fr_dict_t *dict_radius;
+static fr_dict_t *dict_freeradius;
 
 extern fr_dict_autoload_t rlm_wimax_dict[];
 fr_dict_autoload_t rlm_wimax_dict[] = {

diff --git a/src/modules/rlm_winbind/rlm_winbind.c b/src/modules/rlm_winbind/rlm_winbind.c
index 201b64cc53e0e15930aa66414ea60740708a1dca..055df750afcaf0766b73c6bf04ba2a05b4e6d051 100644 (file)
--- a/src/modules/rlm_winbind/rlm_winbind.c
+++ b/src/modules/rlm_winbind/rlm_winbind.c
@@ -50,8 +50,8 @@ static const CONF_PARSER module_config[] = {
        CONF_PARSER_TERMINATOR
 };
 
-static fr_dict_t const *dict_freeradius;
-static fr_dict_t const *dict_radius;
+static fr_dict_t *dict_freeradius;
+static fr_dict_t *dict_radius;
 
 extern fr_dict_autoload_t rlm_winbind_dict[];
 fr_dict_autoload_t rlm_winbind_dict[] = {

diff --git a/src/modules/rlm_yubikey/rlm_yubikey.c b/src/modules/rlm_yubikey/rlm_yubikey.c
index afafbbb9c3e060a3113f1e934d1add86c40bb4df..848037f7196e89472bd56e583692458e1b95a46c 100644 (file)
--- a/src/modules/rlm_yubikey/rlm_yubikey.c
+++ b/src/modules/rlm_yubikey/rlm_yubikey.c
@@ -46,8 +46,8 @@ static const CONF_PARSER module_config[] = {
        CONF_PARSER_TERMINATOR
 };
 
-static fr_dict_t const *dict_freeradius;
-static fr_dict_t const *dict_radius;
+static fr_dict_t *dict_freeradius;
+static fr_dict_t *dict_radius;
 
 extern fr_dict_autoload_t rlm_yubikey_dict[];
 fr_dict_autoload_t rlm_yubikey_dict[] = {

diff --git a/src/protocols/dhcpv4/base.c b/src/protocols/dhcpv4/base.c
index 8f1f687708702eddce6f01fdd6d8d31dbeb2fa6f..f9a71c6478425849292ded9af028155e3658dbe8 100644 (file)
--- a/src/protocols/dhcpv4/base.c
+++ b/src/protocols/dhcpv4/base.c
@@ -35,7 +35,7 @@ typedef struct dhcp_option_t {
        uint8_t         length;
 } dhcp_option_t;
 
-static fr_dict_t const *dict_dhcpv4;
+static fr_dict_t *dict_dhcpv4;
 
 extern fr_dict_autoload_t dhcpv4_dict[];
 fr_dict_autoload_t dhcpv4_dict[] = {

diff --git a/src/protocols/tacacs/tacacs.c b/src/protocols/tacacs/tacacs.c
index fb9cbb5575b4a42a48a1158ea2ed2329c56e9066..efe282d024a945865acfdd125e503cd60ef16f46 100644 (file)
--- a/src/protocols/tacacs/tacacs.c
+++ b/src/protocols/tacacs/tacacs.c
@@ -31,7 +31,7 @@
 
 #include "tacacs.h"
 
-static fr_dict_t const *dict_tacacs;
+static fr_dict_t *dict_tacacs;
 
 extern fr_dict_autoload_t libfreeradius_tacacs_dict[];
 fr_dict_autoload_t libfreeradius_tacacs_dict[] = {