Remove manual bootstrapping, it's not needed

diff --git a/src/lib/io/master.c b/src/lib/io/master.c
index 8f69b0d8e14376325ac9794c9fdfb6a67b626b86..ecc40f7a1adc938a69cc4ec8cbea823f40f380a2 100644 (file)
--- a/src/lib/io/master.c
+++ b/src/lib/io/master.c
@@ -2638,11 +2638,7 @@ static int mod_bootstrap(module_inst_ctx_t const *mctx)
        fr_io_instance_t *inst = mctx->mi->data;
        CONF_SECTION *conf = mctx->mi->conf;
 
-       /*
-        *      Find and bootstrap the application IO handler.
-        */
        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;
 
@@ -2664,11 +2660,6 @@ static int mod_bootstrap(module_inst_ctx_t const *mctx)
                }
        }
 
-       if (inst->app_io->common.bootstrap && (inst->app_io->common.bootstrap(MODULE_INST_CTX(inst->submodule)) < 0)) {
-               cf_log_err(inst->app_io_conf, "Bootstrap failed for proto_%s", inst->app_io->common.name);
-               return -1;
-       }
-
        /*
         *      Get various information after bootstrapping the
         *      application IO module.

diff --git a/src/listen/detail/proto_detail.c b/src/listen/detail/proto_detail.c
index 41bc7c25ba9167d33eee66f70c03024cdf7f5fcf..c5ed83013a8fd1e8f509f980214486dc85516b87 100644 (file)
--- a/src/listen/detail/proto_detail.c
+++ b/src/listen/detail/proto_detail.c
@@ -536,11 +536,6 @@ static int mod_bootstrap(module_inst_ctx_t const *mctx)
        inst->app_io_instance = inst->io_submodule->data;
        inst->app_io_conf = inst->io_submodule->conf;
 
-       if (inst->app_io->common.bootstrap && (inst->app_io->common.bootstrap(MODULE_INST_CTX(inst->io_submodule)) < 0)) {
-               cf_log_err(inst->app_io_conf, "Bootstrap failed for \"%s\"", inst->app_io->common.name);
-               return -1;
-       }
-
        /*
         *      If we're not loading the work submodule directly, then try to load it here.
         */

diff --git a/src/listen/ldap_sync/proto_ldap_sync.c b/src/listen/ldap_sync/proto_ldap_sync.c
index 20b11427ad8e0066d0fd32dfc75ee80969a5a238..a80076998980c4a3b982c6206ee133914c4706eb 100644 (file)
--- a/src/listen/ldap_sync/proto_ldap_sync.c
+++ b/src/listen/ldap_sync/proto_ldap_sync.c
@@ -386,12 +386,6 @@ static int mod_bootstrap(module_inst_ctx_t const *mctx)
        inst->app_io_instance = inst->io_submodule->data;
        inst->app_io_conf = inst->io_submodule->conf;
 
-       if (inst->app_io->common.bootstrap &&
-           (inst->app_io->common.bootstrap(MODULE_INST_CTX(inst->io_submodule)) < 0)) {
-               cf_log_err(inst->app_io_conf, "Bootstrap failed for \"%s\"", inst->app_io->common.name);
-               return -1;
-       }
-
        return 0;
 }