diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-06-06 14:58:28 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-06-06 17:37:51 +1000 |
| commit | 907cdb5de7f16a2540299aeba211bf2a5ae6fafe (patch) | |
| tree | eccc984eb3fd073eb49478ff47163dfdf10d7a29 /source4/torture | |
| parent | f67a14976bd6ccdacd319df872e6add994f0e0f3 (diff) | |
| download | samba-907cdb5de7f16a2540299aeba211bf2a5ae6fafe.tar.gz samba-907cdb5de7f16a2540299aeba211bf2a5ae6fafe.tar.bz2 samba-907cdb5de7f16a2540299aeba211bf2a5ae6fafe.zip | |
s4-modules Remove lp_ctx from init functions that no longer need it
Now that we don't allow the smb.conf to change the modules dir, many
functions that simply load modules or initialise a subsytem that may
load modules no longer need an lp_ctx.
Andrew Bartlett
Diffstat (limited to 'source4/torture')
| -rw-r--r-- | source4/torture/gentest.c | 2 | ||||
| -rw-r--r-- | source4/torture/locktest.c | 2 | ||||
| -rw-r--r-- | source4/torture/masktest.c | 2 | ||||
| -rw-r--r-- | source4/torture/rpc/rpc.c | 2 | ||||
| -rw-r--r-- | source4/torture/smbtorture.c | 2 | ||||
| -rw-r--r-- | source4/torture/torture.c | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/source4/torture/gentest.c b/source4/torture/gentest.c index 6f69460dc8..37ae2c03e5 100644 --- a/source4/torture/gentest.c +++ b/source4/torture/gentest.c @@ -3247,7 +3247,7 @@ static bool split_unc_name(const char *unc, char **server, char **share) ev = s4_event_context_init(talloc_autofree_context()); - gensec_init(lp_ctx); + gensec_init(); ret = start_gentest(ev, lp_ctx); diff --git a/source4/torture/locktest.c b/source4/torture/locktest.c index 445a626e7b..77fcb69eaf 100644 --- a/source4/torture/locktest.c +++ b/source4/torture/locktest.c @@ -644,7 +644,7 @@ static void usage(poptContext pc) ev = s4_event_context_init(talloc_autofree_context()); - gensec_init(lp_ctx); + gensec_init(); DEBUG(0,("seed=%u base=%d range=%d min_length=%d\n", seed, lock_base, lock_range, min_length)); diff --git a/source4/torture/masktest.c b/source4/torture/masktest.c index 65c844bc27..a711634b24 100644 --- a/source4/torture/masktest.c +++ b/source4/torture/masktest.c @@ -360,7 +360,7 @@ static void usage(poptContext pc) ev = s4_event_context_init(mem_ctx); - gensec_init(lp_ctx); + gensec_init(); lpcfg_smbcli_options(lp_ctx, &options); lpcfg_smbcli_session_options(lp_ctx, &session_options); diff --git a/source4/torture/rpc/rpc.c b/source4/torture/rpc/rpc.c index 03936f22ff..01ce93f373 100644 --- a/source4/torture/rpc/rpc.c +++ b/source4/torture/rpc/rpc.c @@ -75,7 +75,7 @@ _PUBLIC_ NTSTATUS torture_rpc_connection(struct torture_context *tctx, NTSTATUS status; struct dcerpc_binding *binding; - dcerpc_init(tctx->lp_ctx); + dcerpc_init(); status = torture_rpc_binding(tctx, &binding); if (NT_STATUS_IS_ERR(status)) diff --git a/source4/torture/smbtorture.c b/source4/torture/smbtorture.c index 62cf0abfb7..83816e8be5 100644 --- a/source4/torture/smbtorture.c +++ b/source4/torture/smbtorture.c @@ -686,7 +686,7 @@ int main(int argc,char *argv[]) torture->lp_ctx = cmdline_lp_ctx; - gensec_init(cmdline_lp_ctx); + gensec_init(); if (shell) { /* In shell mode, just ignore any remaining test names. */ diff --git a/source4/torture/torture.c b/source4/torture/torture.c index ffd884a38d..3dae9f5863 100644 --- a/source4/torture/torture.c +++ b/source4/torture/torture.c @@ -62,7 +62,7 @@ _PUBLIC_ int torture_init(void) #define _MODULE_PROTO(init) extern NTSTATUS init(void); STATIC_smbtorture_MODULES_PROTO; init_module_fn static_init[] = { STATIC_smbtorture_MODULES }; - init_module_fn *shared_init = load_samba_modules(NULL, cmdline_lp_ctx, "smbtorture"); + init_module_fn *shared_init = load_samba_modules(NULL, "smbtorture"); run_init_functions(static_init); run_init_functions(shared_init); |