Use correct/shallower public symbol pointer for submodules

diff --git a/src/lib/io/master.c b/src/lib/io/master.c
index 0f4b91e7c941997d6edb163b2e6356b0063922ff..c52e99b004cdfc6bda8fb96b21f60209774c2863 100644 (file)
--- a/src/lib/io/master.c
+++ b/src/lib/io/master.c
@@ -2632,7 +2632,7 @@ static int mod_bootstrap(module_inst_ctx_t const *mctx)
        /*
         *      Find and bootstrap the application IO handler.
         */
-       inst->app_io = (fr_app_io_t const *) inst->submodule->module->exported;
+       inst->app_io = (fr_app_io_t const *) inst->submodule->exported;
 
        inst->app_io_conf = inst->submodule->conf;
        inst->app_io_instance = inst->submodule->data;

diff --git a/src/listen/arp/proto_arp.c b/src/listen/arp/proto_arp.c
index f05f57f6a96a69409032dba52b5d02d4cba67de0..4fb11e7f2f4f81d9fe77a78c1b65c75b203bbab7 100644 (file)
--- a/src/listen/arp/proto_arp.c
+++ b/src/listen/arp/proto_arp.c
@@ -181,7 +181,7 @@ static int mod_open(void *instance, fr_schedule_t *sc, UNUSED CONF_SECTION *conf
        li->default_message_size = FR_ARP_PACKET_SIZE;
        li->num_messages = inst->num_messages;
 
-       li->app_io = (fr_app_io_t const *)inst->io_submodule->module->exported;
+       li->app_io = (fr_app_io_t const *)inst->io_submodule->exported;
        li->app_io_instance = inst->io_submodule->data;
        if (li->app_io->common.thread_inst_size) {
                li->thread_instance = talloc_zero_array(NULL, uint8_t, li->app_io->common.thread_inst_size);

diff --git a/src/listen/detail/proto_detail.c b/src/listen/detail/proto_detail.c
index d8282f8adf825fe31a22da21d11a80abdb60bd83..b4a1b4d6814c18d9374898e7cfd8207d49f735ed 100644 (file)
--- a/src/listen/detail/proto_detail.c
+++ b/src/listen/detail/proto_detail.c
@@ -532,7 +532,7 @@ static int mod_bootstrap(module_inst_ctx_t const *mctx)
        /*
         *      Bootstrap the I/O module
         */
-       inst->app_io = (fr_app_io_t const *) inst->io_submodule->module->exported;
+       inst->app_io = (fr_app_io_t const *) inst->io_submodule->exported;
        inst->app_io_instance = inst->io_submodule->data;
        inst->app_io_conf = inst->io_submodule->conf;
 
@@ -582,7 +582,7 @@ static int mod_bootstrap(module_inst_ctx_t const *mctx)
 
                if (module_instance_conf_parse(inst->work_submodule, transport_cs) < 0) goto error;
 
-               inst->work_io = (fr_app_io_t const *) inst->work_submodule->module->exported;
+               inst->work_io = (fr_app_io_t const *) inst->work_submodule->exported;
                inst->work_io_instance = inst->work_submodule->data;
                inst->work_io_conf = inst->work_submodule->conf;
        }

diff --git a/src/listen/ldap_sync/proto_ldap_sync.c b/src/listen/ldap_sync/proto_ldap_sync.c
index 8dcf914f1be2ce875052766f99a817444c8e5656..20b11427ad8e0066d0fd32dfc75ee80969a5a238 100644 (file)
--- a/src/listen/ldap_sync/proto_ldap_sync.c
+++ b/src/listen/ldap_sync/proto_ldap_sync.c
@@ -382,7 +382,7 @@ static int mod_bootstrap(module_inst_ctx_t const *mctx)
        /*
         *      Bootstrap the I/O module
         */
-       inst->app_io = (fr_app_io_t const *) inst->io_submodule->module->exported;
+       inst->app_io = (fr_app_io_t const *) inst->io_submodule->exported;
        inst->app_io_instance = inst->io_submodule->data;
        inst->app_io_conf = inst->io_submodule->conf;
 

diff --git a/src/modules/rlm_cache/rlm_cache.c b/src/modules/rlm_cache/rlm_cache.c
index ae92fe27704751889d28e52ecfb3742f9d973a78..03ff26ea5e6cce8f74a985e0a5631e74138c8926 100644 (file)
--- a/src/modules/rlm_cache/rlm_cache.c
+++ b/src/modules/rlm_cache/rlm_cache.c
@@ -1462,7 +1462,7 @@ static int mod_bootstrap(module_inst_ctx_t const *mctx)
        rlm_cache_t     *inst = talloc_get_type_abort(mctx->mi->data, rlm_cache_t );
        xlat_t          *xlat;
 
-       inst->driver = (rlm_cache_driver_t const *)inst->driver_submodule->module->exported;
+       inst->driver = (rlm_cache_driver_t const *)inst->driver_submodule->exported;
 
        /*
         *      Non optional fields and callbacks

diff --git a/src/modules/rlm_eap/rlm_eap.c b/src/modules/rlm_eap/rlm_eap.c
index b897526f402ee3dea031b1f4970384297f232187..056d7d3f8361a6046e323a1718a75e3c86217685 100644 (file)
--- a/src/modules/rlm_eap/rlm_eap.c
+++ b/src/modules/rlm_eap/rlm_eap.c
@@ -686,7 +686,7 @@ static unlang_action_t eap_method_select(rlm_rcode_t *p_result, module_ctx_t con
 
                        for (i = 0; i < inst->type_identity_submodule_len; i++) {
                                rlm_eap_submodule_t const *submodule =
-                                       (rlm_eap_submodule_t const *)inst->type_identity_submodule[i]->module;
+                                       (rlm_eap_submodule_t const *)inst->type_identity_submodule[i]->exported;
                                eap_type_t ret;
 
                                ret = submodule->type_identity(inst->type_identity_submodule[i]->data,

diff --git a/src/modules/rlm_radius/rlm_radius.c b/src/modules/rlm_radius/rlm_radius.c
index 09a77f3954160b20b962a7f8631098cea4692b81..92f9e07c0298b2d803166063d1fe9327bd28a4d1 100644 (file)
--- a/src/modules/rlm_radius/rlm_radius.c
+++ b/src/modules/rlm_radius/rlm_radius.c
@@ -333,7 +333,7 @@ static int status_check_update_parse(TALLOC_CTX *ctx, void *out, UNUSED void *pa
 static void mod_radius_signal(module_ctx_t const *mctx, request_t *request, fr_signal_t action)
 {
        rlm_radius_t const      *inst = talloc_get_type_abort_const(mctx->mi->data, rlm_radius_t);
-       rlm_radius_io_t const   *io = (rlm_radius_io_t const *)inst->io_submodule->module;              /* Public symbol exported by the module */
+       rlm_radius_io_t const   *io = (rlm_radius_io_t const *)inst->io_submodule->exported;            /* Public symbol exported by the module */
 
        /*
         *      We received a duplicate packet, but we're not doing
@@ -458,7 +458,7 @@ static int mod_bootstrap(module_inst_ctx_t const *mctx)
        rlm_radius_t *inst = talloc_get_type_abort(mctx->mi->data, rlm_radius_t);
        CONF_SECTION *conf = mctx->mi->conf;
 
-       inst->io = (rlm_radius_io_t const *)inst->io_submodule->module; /* Public symbol exported by the module */
+       inst->io = (rlm_radius_io_t const *)inst->io_submodule->exported;       /* Public symbol exported by the module */
        inst->name = mctx->mi->name;
 
        /*

diff --git a/src/modules/rlm_sql/rlm_sql.c b/src/modules/rlm_sql/rlm_sql.c
index b182f8dea53987c6da54c92b18bde90215441fdf..6a93c463e4e7ebd44cd2073d8a43fd7cc3fa7ea8 100644 (file)
--- a/src/modules/rlm_sql/rlm_sql.c
+++ b/src/modules/rlm_sql/rlm_sql.c
@@ -1772,7 +1772,7 @@ static int mod_bootstrap(module_inst_ctx_t const *mctx)
        rlm_sql_escape_uctx_t   *uctx;
 
        inst->name = mctx->mi->name;    /* Need this for functions in sql.c */
-       inst->driver = (rlm_sql_driver_t const *)inst->driver_submodule->module->exported; /* Public symbol exported by the submodule */
+       inst->driver = (rlm_sql_driver_t const *)inst->driver_submodule->exported; /* Public symbol exported by the submodule */
 
        /*
         *      Register the group comparison attribute

diff --git a/src/modules/rlm_tacacs/rlm_tacacs.c b/src/modules/rlm_tacacs/rlm_tacacs.c
index 24b30ab88f68b37ac38fe24c6cf413bbfef37db0..d3a5d71d0f4fbf54ec52a004ead3ace587e89b9b 100644 (file)
--- a/src/modules/rlm_tacacs/rlm_tacacs.c
+++ b/src/modules/rlm_tacacs/rlm_tacacs.c
@@ -131,7 +131,7 @@ static int type_parse(UNUSED TALLOC_CTX *ctx, void *out, UNUSED void *parent,
 static void mod_tacacs_signal(module_ctx_t const *mctx, request_t *request, fr_signal_t action)
 {
        rlm_tacacs_t const      *inst = talloc_get_type_abort_const(mctx->mi->data, rlm_tacacs_t);
-       rlm_tacacs_io_t const   *io = (rlm_tacacs_io_t const *)inst->io_submodule->module;              /* Public symbol exported by the module */
+       rlm_tacacs_io_t const   *io = (rlm_tacacs_io_t const *)inst->io_submodule->exported;            /* Public symbol exported by the module */
 
        /*
         *      We received a duplicate packet, ignore the dup, and rely on the
@@ -190,7 +190,7 @@ static int mod_bootstrap(module_inst_ctx_t const *mctx)
        size_t i, num_types;
        rlm_tacacs_t *inst = talloc_get_type_abort(mctx->mi->data, rlm_tacacs_t);
 
-       inst->io = (rlm_tacacs_io_t const *)inst->io_submodule->module; /* Public symbol exported by the module */
+       inst->io = (rlm_tacacs_io_t const *)inst->io_submodule->exported;       /* Public symbol exported by the module */
        inst->name = mctx->mi->name;
 
        /*