diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-08 23:32:37 +0100 |
---|---|---|
committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:48:56 +0100 |
commit | dd7e5ed88c48f4ee39e53be07c8839791e914e45 (patch) | |
tree | fca88a741257b2f5165f3762de6c44053888fc3e /source4/torture/locktest.c | |
parent | 75ac6cd318ae58aacc77785ba93af50bfe354b63 (diff) | |
download | samba-dd7e5ed88c48f4ee39e53be07c8839791e914e45.tar.gz |
r26352: Don't make lp_load create a new context.
(This used to be commit d0d5c1a823a6601292c061dba2b6f4bde2b9e3dd)
Diffstat (limited to 'source4/torture/locktest.c')
-rw-r--r-- | source4/torture/locktest.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source4/torture/locktest.c b/source4/torture/locktest.c index a53422fb44b..d51c2692d72 100644 --- a/source4/torture/locktest.c +++ b/source4/torture/locktest.c @@ -565,7 +565,8 @@ static void usage(void) argc -= NSERVERS; argv += NSERVERS; - lp_load(talloc_autofree_context(), dyn_CONFIGFILE, &lp_ctx); + global_loadparm = lp_ctx = loadparm_init(talloc_autofree_context()); + lp_load(lp_ctx, dyn_CONFIGFILE); servers[0] = cli_credentials_init(talloc_autofree_context()); servers[1] = cli_credentials_init(talloc_autofree_context()); |