Call cf_section_parse_pass2() after loading all of the modules

diff --git a/src/main/modules.c b/src/main/modules.c
index ce7d570..f82773f 100644 (file)
--- a/src/main/modules.c
+++ b/src/main/modules.c
@@ -1428,6 +1428,20 @@ static int pass2_cb(UNUSED void *ctx, void *data)
        return 0;
 }
 
+static int pass2_instance_cb(UNUSED void *ctx, void *data)
+{
+       module_instance_t *node = data;
+
+       if (!node->entry->module->config || !node->cs) return 0;
+
+       if (cf_section_parse_pass2(node->cs, node->insthandle,
+                                  node->entry->module->config) < 0) {
+               return -1;
+       }
+
+       return 0;
+}
+
 /*
  *     Load all of the virtual servers.
  */
@@ -1495,6 +1509,14 @@ int virtual_servers_load(CONF_SECTION *config)
        }
 
        /*
+        *      Check all of the module config items which are xlat expanded.
+        */
+       if (rbtree_walk(instance_tree, RBTREE_IN_ORDER,
+                       pass2_instance_cb, NULL) != 0) {
+               return -1;
+       }
+
+       /*
         *      Now that we've loaded everything, run pass 2 over the
         *      conditions and xlats.
         */