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/scripting/ejs/smbcalls.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/scripting/ejs/smbcalls.c')
-rw-r--r-- | source4/scripting/ejs/smbcalls.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c index 91e58873df..8a3ce245d2 100644 --- a/source4/scripting/ejs/smbcalls.c +++ b/source4/scripting/ejs/smbcalls.c @@ -184,7 +184,7 @@ void smb_setup_ejs_functions(void (*exception_handler)(const char *)) smb_setup_ejs_param(); smb_setup_ejs_literal(); - shared_init = load_samba_modules(NULL, "smbcalls"); + shared_init = load_samba_modules(NULL, global_loadparm, "smbcalls"); run_init_functions(static_init); run_init_functions(shared_init); |