Skip to content

Commit

Permalink
Remove manual bootstrapping, it's not needed
Browse files Browse the repository at this point in the history
  • Loading branch information
arr2036 committed May 10, 2024
1 parent 23430ea commit 9c608cc
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 20 deletions.
9 changes: 0 additions & 9 deletions src/lib/io/master.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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.
Expand Down
5 changes: 0 additions & 5 deletions src/listen/detail/proto_detail.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
Expand Down
6 changes: 0 additions & 6 deletions src/listen/ldap_sync/proto_ldap_sync.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down

0 comments on commit 9c608cc

Please sign in to comment.