add fr_dict_t to the top-level CONF_SECTION

diff --git a/src/lib/server/cf_file.c b/src/lib/server/cf_file.c
index 882bbb6efa36c1dfbbde4953f95e208e72e0d5af..a6fdfbfb5fd96bf4f7fb42bcf4511be703e856b1 100644 (file)
--- a/src/lib/server/cf_file.c
+++ b/src/lib/server/cf_file.c
@@ -2163,7 +2163,7 @@ static int parse_input(cf_stack_t *stack)
                        goto check_for_eol;
                }
 
-               if (!parent->allow_locals) {
+               if (!parent->allow_locals && (strcmp(parent->name1, "dictionary") != 0)) {
                        ERROR("%s[%d]: Parse error: Invalid location for variable definition",
                              frame->filename, frame->lineno);
                        return -1;

diff --git a/src/lib/server/virtual_servers.c b/src/lib/server/virtual_servers.c
index f2b1f8f5896bf6f6d991be81dd972a888114e2b0..6174a7379e18cb445238141b8a8b33874d0e09cf 100644 (file)
--- a/src/lib/server/virtual_servers.c
+++ b/src/lib/server/virtual_servers.c
@@ -223,6 +223,7 @@ static int namespace_on_read(TALLOC_CTX *ctx, UNUSED void *out, UNUSED void *par
                return -1;
        }
        cf_data_add(server_cs, mi, "process_module", false);
+       cf_data_add(server_cs, *(process->dict), "dict", false);        
 
        return 0;
 }
@@ -312,7 +313,8 @@ static int namespace_parse(UNUSED TALLOC_CTX *ctx, void *out, UNUSED void *paren
 
        if (module_conf_parse(mi, process_cs) < 0) {
                cf_log_perr(ci, "Failed bootstrapping process module");
-               cf_data_remove(server_cs, mi, "process_module");
+               cf_data_remove(server_cs, module_instance_t, "process_module");
+               cf_data_remove(server_cs, fr_dict_t, "dict");
                TALLOC_FREE(server->process_mi);
                return -1;
        }
@@ -516,14 +518,10 @@ fr_dict_t const *virtual_server_dict_by_cs(CONF_SECTION const *server_cs)
 {
        CONF_DATA const *cd;
 
-       cd = cf_data_find(server_cs, module_instance_t, "process_module");
-       if (cd) {
-               module_instance_t const *mi = cf_data_value(cd);
-               fr_process_module_t const *process = (fr_process_module_t const *)mi->module;
+       cd = cf_data_find(server_cs, fr_dict_t, "dict");
+       if (!cd) return NULL;
 
-               return *(process->dict);
-       }
-       return NULL;
+       return (fr_dict_t const *) cf_data_value(cd);
 }
 
 /** Return the namespace for a given virtual server specified by a CONF_ITEM within the virtual server
@@ -537,14 +535,10 @@ fr_dict_t const *virtual_server_dict_by_child_ci(CONF_ITEM const *ci)
 {
        CONF_DATA const *cd;
 
-       cd = cf_data_find_in_parent(ci, module_instance_t, "process_module");
-       if (cd) {
-               module_instance_t const *mi = cf_data_value(cd);
-               fr_process_module_t const *process = (fr_process_module_t const *)mi->module;
+       cd = cf_data_find_in_parent(ci, fr_dict_t, "dict");
+       if (!cd) return NULL;
 
-               return *(process->dict);
-       }
-       return NULL;
+       return (fr_dict_t const *) cf_data_value(cd);
 }
 
 /** Verify that a given virtual_server exists and is of a particular namespace
@@ -1228,7 +1222,7 @@ int virtual_servers_instantiate(void)
                if (process->compile_list) {
                        tmpl_rules_t            parse_rules = {
                                .attr = {
-                                       .dict_def = *(process->dict),
+                                       .dict_def = cf_data_value(cf_data_find(server_cs, fr_dict_t, "dict")),
                                        .list_def = request_attr_request,
                                },
                        };