diff options
Diffstat (limited to 'source4/smbd')
| -rw-r--r-- | source4/smbd/process_model.c | 12 | ||||
| -rw-r--r-- | source4/smbd/server.c | 12 | ||||
| -rw-r--r-- | source4/smbd/wscript_build | 2 |
3 files changed, 13 insertions, 13 deletions
diff --git a/source4/smbd/process_model.c b/source4/smbd/process_model.c index b3ac07e4a6..bbcbe3b6ac 100644 --- a/source4/smbd/process_model.c +++ b/source4/smbd/process_model.c @@ -21,7 +21,7 @@ #include "includes.h" #include "smbd/process_model.h" #include "param/param.h" -#include "lib/util/samba_module.h" +#include "lib/util/samba_modules.h" /* the list of currently registered process models */ static struct process_model { @@ -103,8 +103,8 @@ _PUBLIC_ NTSTATUS process_model_init(struct loadparm_context *lp_ctx) { #define _MODULE_PROTO(init) extern NTSTATUS init(void); STATIC_process_model_MODULES_PROTO; - samba_module_init_fn static_init[] = { STATIC_process_model_MODULES }; - samba_module_init_fn *shared_init; + init_module_fn static_init[] = { STATIC_process_model_MODULES }; + init_module_fn *shared_init; static bool initialised; if (initialised) { @@ -112,10 +112,10 @@ _PUBLIC_ NTSTATUS process_model_init(struct loadparm_context *lp_ctx) } initialised = true; - shared_init = samba_module_init_fns_for_subsystem(NULL, "process_model"); + shared_init = load_samba_modules(NULL, "process_model"); - samba_module_init_fns_run(static_init); - samba_module_init_fns_run(shared_init); + run_init_functions(static_init); + run_init_functions(shared_init); talloc_free(shared_init); diff --git a/source4/smbd/server.c b/source4/smbd/server.c index a2f4a785ad..86622c8be9 100644 --- a/source4/smbd/server.c +++ b/source4/smbd/server.c @@ -42,7 +42,7 @@ #include "librpc/gen_ndr/ndr_irpc.h" #include "cluster/cluster.h" #include "dynconfig/dynconfig.h" -#include "lib/util/samba_module.h" +#include "lib/util/samba_modules.h" /* recursively delete a directory tree @@ -292,8 +292,8 @@ static int binary_smbd_main(const char *binary_name, int argc, const char *argv[ poptContext pc; #define _MODULE_PROTO(init) extern NTSTATUS init(void); STATIC_service_MODULES_PROTO; - samba_module_init_fn static_init[] = { STATIC_service_MODULES }; - samba_module_init_fn *shared_init; + init_module_fn static_init[] = { STATIC_service_MODULES }; + init_module_fn *shared_init; struct tevent_context *event_ctx; uint16_t stdin_event_flags; NTSTATUS status; @@ -409,10 +409,10 @@ static int binary_smbd_main(const char *binary_name, int argc, const char *argv[ process_model_init(cmdline_lp_ctx); - shared_init = samba_module_init_fns_for_subsystem(NULL, "service"); + shared_init = load_samba_modules(NULL, "service"); - samba_module_init_fns_run(static_init); - samba_module_init_fns_run(shared_init); + run_init_functions(static_init); + run_init_functions(shared_init); talloc_free(shared_init); diff --git a/source4/smbd/wscript_build b/source4/smbd/wscript_build index 20fabe1a27..ab92e3c920 100644 --- a/source4/smbd/wscript_build +++ b/source4/smbd/wscript_build @@ -76,7 +76,7 @@ bld.SAMBA_MODULE('process_model_onefork', bld.SAMBA_LIBRARY('process_model', source='process_model.c', autoproto='process_model_proto.h', - deps='samba-util samba-hostconfig samba-module', + deps='samba-util samba-hostconfig samba-modules', private_library=True ) |