From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Wed, 23 May 2018 04:21:02 +0000 (+0600)
Subject: De-consitfy dictionary pointers so modules can add their own attributes
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f9ccfce6bb1c237cc4c9d2902067f0785b5fe0c8;p=thirdparty%2Ffreeradius-server.git

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

diff --git a/src/include/dict.h b/src/include/dict.h
index 25db2c2d6a3..8e225d2d995 100644
--- 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 ab936d2a2b7..92f8674d7ee 100644
--- 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 53f8259bc3d..f02018e1b3d 100644
--- 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 acbc2edc984..70df389e400 100644
--- 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 44a49bcf6d0..1652121c7cd 100644
--- 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 649160f29ba..063db5ae9e1 100644
--- 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 7aab8dc2846..0a172f5bb49 100644
--- 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 f06cd69c283..19e99d056a7 100644
--- 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 70d96e38572..96048a2410d 100644
--- 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 7cd470ba3d5..9f457573a20 100644
--- 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 3b03be895cc..15b25c8cefc 100644
--- 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 44eb6f63858..5f80b8fed61 100644
--- 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 23ac7aedb7f..ae0010e08d2 100644
--- 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 07dc79384d0..9bdaf83d6d5 100644
--- 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 409cc283c6d..cef502e36ca 100644
--- 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 7f9c098b68a..521a852b6aa 100644
--- 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 cafa9609e93..89da3c2e2a0 100644
--- 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 64d3b3d887b..e749c5e4408 100644
--- 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 718579c0be0..2be33d6446a 100644
--- 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 0a927f0ac70..f7409dc5205 100644
--- 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 a3af2ded2ea..8300bf830dd 100644
--- 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 0a5908f612f..3ab8fdf4edd 100644
--- 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 c54aa443212..66d5f792e68 100644
--- 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 cfc93e170e8..c6fe92e35d3 100644
--- 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 82db41776e0..3f273133f5a 100644
--- 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 6b3d8d2e223..a493e133c23 100644
--- 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 ac3601b435d..538dcad7b78 100644
--- 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 ab939f9f545..1792fd9fddb 100644
--- 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 16a9255e5d9..2a8ef5d764a 100644
--- 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 d16af23ba0f..63649fdc983 100644
--- 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 3404e13845d..7de0cb3b110 100644
--- 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 d84e64bfe51..2b96dc5dc0b 100644
--- 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 4dd24e504ff..7fd34956cda 100644
--- 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 022dd9220eb..e8f958d9512 100644
--- 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 a714e251fed..ee43c7e0019 100644
--- 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 57b517bcc1d..14561b4804c 100644
--- 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 d18d74532d7..ee1c076b718 100644
--- 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 f66150795c9..c89708cc1f1 100644
--- 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 382db416c9b..a5e7efb0877 100644
--- 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 f0692403c18..71cc3f0f0c1 100644
--- 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 ae164a48afb..746237daf09 100644
--- 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 8b70b53a2e7..7e45c99e3a5 100644
--- 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 f50afafddd0..d3896969d37 100644
--- 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 4facab34c61..ef3e0cdeb7c 100644
--- 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 34f5aafa5f2..8d89f511923 100644
--- 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 44a0fc16a3e..0fb66a83462 100644
--- 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 2df308dfda2..6ec90627832 100644
--- 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 dffc082e79d..ff12ac032be 100644
--- 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 adf0ddec4e0..5c85a7f33bd 100644
--- 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 d9581d42b79..b7596dbb897 100644
--- 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 658e74170c4..409bfbf1fa9 100644
--- 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 63d172f47b3..d0539c3db39 100644
--- 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 91c6c1cc22c..1534b4dbba1 100644
--- 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 70822fd113f..7b8820ea01b 100644
--- 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 0f025465795..28fac480b85 100644
--- 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 c49667c98ce..c977f66e341 100644
--- 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 6748ceca8e4..5e72077e7b2 100644
--- 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 5a5ee4cce12..0b1698dba06 100644
--- 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 55b9c4636b0..9f0547624ca 100644
--- 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 d2cc7da82f8..1882090aa2b 100644
--- 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 9e6a0724398..e4d2fc30511 100644
--- 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 0966052aff0..f25af3e86a2 100644
--- 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 04303c8d889..cea16f08e3d 100644
--- 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 13f712d45f2..d4a8b6b4a50 100644
--- 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 e1822945e9c..dceb11b038d 100644
--- 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 413297035c0..c4ab9fc5a85 100644
--- 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 6a49d00dcd3..1b495f3cb93 100644
--- 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 56073d015d4..b608190998f 100644
--- 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 a7e707fe8d3..b605877078c 100644
--- 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 8e977aab0dd..5b546b748e3 100644
--- 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 201b64cc53e..055df750afc 100644
--- 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 afafbbb9c3e..848037f7196 100644
--- 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 8f1f6877087..f9a71c64784 100644
--- 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 fb9cbb5575b..efe282d024a 100644
--- 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[] = {