diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-10-01 18:52:55 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 15:07:34 -0500 |
| commit | 2f3551ca7cee59d4d053cceb87abdf1da1b3a1ad (patch) | |
| tree | 2d02f6e998c150cca5323e574ffb8094fffc288f /source4/smbd | |
| parent | 4d7273715f109db82a4ee4852855927a32bb4073 (diff) | |
| download | samba-2f3551ca7cee59d4d053cceb87abdf1da1b3a1ad.tar.gz samba-2f3551ca7cee59d4d053cceb87abdf1da1b3a1ad.tar.bz2 samba-2f3551ca7cee59d4d053cceb87abdf1da1b3a1ad.zip | |
r25446: Merge some changes I made on the way home from SFO:
2007-09-29 More higher-level passing around of lp_ctx.
2007-09-29 Fix warning.
2007-09-29 Pass loadparm contexts on a higher level.
2007-09-29 Avoid using global loadparm context.
(This used to be commit 3468952e771ab31f90b6c374ade01c5550810f42)
Diffstat (limited to 'source4/smbd')
| -rw-r--r-- | source4/smbd/process_model.c | 2 | ||||
| -rw-r--r-- | source4/smbd/server.c | 4 | ||||
| -rw-r--r-- | source4/smbd/service_stream.c | 4 | ||||
| -rw-r--r-- | source4/smbd/service_task.c | 5 |
4 files changed, 10 insertions, 5 deletions
diff --git a/source4/smbd/process_model.c b/source4/smbd/process_model.c index e11e6193fe..bb4d3a53bb 100644 --- a/source4/smbd/process_model.c +++ b/source4/smbd/process_model.c @@ -83,7 +83,7 @@ _PUBLIC_ NTSTATUS register_process_model(const void *_ops) NTSTATUS process_model_init(void) { init_module_fn static_init[] = STATIC_process_model_MODULES; - init_module_fn *shared_init = load_samba_modules(NULL, "process_model"); + init_module_fn *shared_init = load_samba_modules(NULL, global_loadparm, "process_model"); run_init_functions(static_init); run_init_functions(shared_init); diff --git a/source4/smbd/server.c b/source4/smbd/server.c index 7d84ffe812..e86ddc910b 100644 --- a/source4/smbd/server.c +++ b/source4/smbd/server.c @@ -93,7 +93,7 @@ static void cleanup_tmp_files(void) char *path; TALLOC_CTX *mem_ctx = talloc_new(NULL); - path = smbd_tmp_path(mem_ctx, NULL); + path = smbd_tmp_path(mem_ctx, global_loadparm, NULL); recursive_delete(path); talloc_free(mem_ctx); @@ -296,7 +296,7 @@ static int binary_smbd_main(const char *binary_name, int argc, const char *argv[ process_model_init(); - shared_init = load_samba_modules(NULL, "service"); + shared_init = load_samba_modules(NULL, global_loadparm, "service"); run_init_functions(static_init); run_init_functions(shared_init); diff --git a/source4/smbd/service_stream.c b/source4/smbd/service_stream.c index 1f1f92b495..31107df032 100644 --- a/source4/smbd/service_stream.c +++ b/source4/smbd/service_stream.c @@ -181,7 +181,9 @@ static void stream_new_connection(struct event_context *ev, } /* setup to receive internal messages on this connection */ - srv_conn->msg_ctx = messaging_init(srv_conn, srv_conn->server_id, ev); + srv_conn->msg_ctx = messaging_init(srv_conn, + lp_messaging_path(srv_conn, global_loadparm), + srv_conn->server_id, ev); if (!srv_conn->msg_ctx) { stream_terminate_connection(srv_conn, "messaging_init() failed"); return; diff --git a/source4/smbd/service_task.c b/source4/smbd/service_task.c index cab5c7e112..c77cae4185 100644 --- a/source4/smbd/service_task.c +++ b/source4/smbd/service_task.c @@ -25,6 +25,7 @@ #include "smbd/service.h" #include "smbd/service_task.h" #include "lib/messaging/irpc.h" +#include "param/param.h" /* terminate a task service @@ -64,7 +65,9 @@ static void task_server_callback(struct event_context *event_ctx, task->model_ops = state->model_ops; task->server_id = server_id; - task->msg_ctx = messaging_init(task, task->server_id, task->event_ctx); + task->msg_ctx = messaging_init(task, + lp_messaging_path(task, global_loadparm), + task->server_id, task->event_ctx); if (!task->msg_ctx) { task_server_terminate(task, "messaging_init() failed"); return; |