diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-23 23:54:30 -0600 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-24 01:51:06 -0600 |
| commit | be33f4c611d37ebba59ff618033dc73601339ad1 (patch) | |
| tree | 2d1fdd393172069a89dd5819d614db6a917bc984 /source4/smbd | |
| parent | 1ab5bcfb93c9fc7b18d55e6c5995efddf97fea09 (diff) | |
| download | samba-be33f4c611d37ebba59ff618033dc73601339ad1.tar.gz samba-be33f4c611d37ebba59ff618033dc73601339ad1.tar.bz2 samba-be33f4c611d37ebba59ff618033dc73601339ad1.zip | |
r26576: Allow the static module loading code to be used for the Python modules.
Simplify the way module initialization functions are handled.
(This used to be commit ba8be2dfc0de4434c798663336b81f7f95cde520)
Diffstat (limited to 'source4/smbd')
| -rw-r--r-- | source4/smbd/process_model.c | 2 | ||||
| -rw-r--r-- | source4/smbd/server.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source4/smbd/process_model.c b/source4/smbd/process_model.c index e240ae2c60..dc3ede613c 100644 --- a/source4/smbd/process_model.c +++ b/source4/smbd/process_model.c @@ -82,7 +82,7 @@ _PUBLIC_ NTSTATUS register_process_model(const void *_ops) NTSTATUS process_model_init(struct loadparm_context *lp_ctx) { - init_module_fn static_init[] = STATIC_process_model_MODULES; + init_module_fn static_init[] = { STATIC_process_model_MODULES, NULL }; init_module_fn *shared_init = load_samba_modules(NULL, lp_ctx, "process_model"); run_init_functions(static_init); diff --git a/source4/smbd/server.c b/source4/smbd/server.c index 3f1d3c35d8..78892b6760 100644 --- a/source4/smbd/server.c +++ b/source4/smbd/server.c @@ -187,7 +187,7 @@ static int binary_smbd_main(const char *binary_name, int argc, const char *argv[ bool opt_interactive = false; int opt; poptContext pc; - init_module_fn static_init[] = STATIC_service_MODULES; + init_module_fn static_init[] = { STATIC_service_MODULES, NULL }; init_module_fn *shared_init; struct event_context *event_ctx; NTSTATUS status; |