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/server.c | |
| 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/server.c')
| -rw-r--r-- | source4/smbd/server.c | 4 |
1 files changed, 2 insertions, 2 deletions
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); |