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 | |
| parent | 75ac6cd318ae58aacc77785ba93af50bfe354b63 (diff) | |
| download | samba-dd7e5ed88c48f4ee39e53be07c8839791e914e45.tar.gz samba-dd7e5ed88c48f4ee39e53be07c8839791e914e45.tar.bz2 samba-dd7e5ed88c48f4ee39e53be07c8839791e914e45.zip | |
r26352: Don't make lp_load create a new context.
(This used to be commit d0d5c1a823a6601292c061dba2b6f4bde2b9e3dd)
Diffstat (limited to 'source4/torture')
| -rw-r--r-- | source4/torture/gentest.c | 3 | ||||
| -rw-r--r-- | source4/torture/locktest.c | 3 | ||||
| -rw-r--r-- | source4/torture/locktest2.c | 3 | ||||
| -rw-r--r-- | source4/torture/masktest.c | 3 |
4 files changed, 8 insertions, 4 deletions
diff --git a/source4/torture/gentest.c b/source4/torture/gentest.c index c1e33820af..e8e531a119 100644 --- a/source4/torture/gentest.c +++ b/source4/torture/gentest.c @@ -2197,7 +2197,8 @@ static bool split_unc_name(const char *unc, char **server, char **share) 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].credentials = cli_credentials_init(talloc_autofree_context()); servers[1].credentials = cli_credentials_init(talloc_autofree_context()); diff --git a/source4/torture/locktest.c b/source4/torture/locktest.c index a53422fb44..d51c2692d7 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()); diff --git a/source4/torture/locktest2.c b/source4/torture/locktest2.c index e8b0170f91..19629d8770 100644 --- a/source4/torture/locktest2.c +++ b/source4/torture/locktest2.c @@ -484,7 +484,8 @@ static void usage(void) argc -= 4; argv += 4; - lp_load(talloc_autofree_context(), dyn_CONFIGFILE, &lp_ctx); + global_loadparm = lp_ctx = loadparm_init(talloc_autofree_context()); + lp_load(lp_ctx, dyn_CONFIGFILE); if (getenv("USER")) { fstrcpy(username,getenv("USER")); diff --git a/source4/torture/masktest.c b/source4/torture/masktest.c index 402ea4ae9c..612b96e4f7 100644 --- a/source4/torture/masktest.c +++ b/source4/torture/masktest.c @@ -303,7 +303,8 @@ static void usage(void) argc -= 1; argv += 1; - lp_load(talloc_autofree_context(), dyn_CONFIGFILE, &lp_ctx); + lp_ctx = global_loadparm = loadparm_init(talloc_autofree_context()); + lp_load(lp_ctx, dyn_CONFIGFILE); credentials = cli_credentials_init(talloc_autofree_context()); cli_credentials_guess(credentials, lp_ctx); |