summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2008-02-15 13:29:32 +1100
committerAndrew Tridgell <tridge@samba.org>2008-02-15 13:29:32 +1100
commit60b314428008878f949b9fba54825c2f4f900288 (patch)
tree2501ddc2d1082814e5bae4ff2e20ecd57a17df4a /source4
parentb640f475be9b0f83e7812a5c7756344c5891cba3 (diff)
downloadsamba-60b314428008878f949b9fba54825c2f4f900288.tar.gz
samba-60b314428008878f949b9fba54825c2f4f900288.tar.bz2
samba-60b314428008878f949b9fba54825c2f4f900288.zip
fixed loadparm handling in standalone tests
(This used to be commit 2633f4259ed30ab990017c4c3205f92bf38f0135)
Diffstat (limited to 'source4')
-rw-r--r--source4/torture/gentest.c2
-rw-r--r--source4/torture/locktest.c2
-rw-r--r--source4/torture/masktest.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/source4/torture/gentest.c b/source4/torture/gentest.c
index d50393baf0..8fa433a872 100644
--- a/source4/torture/gentest.c
+++ b/source4/torture/gentest.c
@@ -2205,7 +2205,7 @@ static bool split_unc_name(const char *unc, char **server, char **share)
argc -= NSERVERS;
argv += NSERVERS;
- lp_ctx = loadparm_init(talloc_autofree_context());
+ global_loadparm = lp_ctx = loadparm_init(talloc_autofree_context());
lp_load(lp_ctx, dyn_CONFIGFILE);
servers[0].credentials = cli_credentials_init(talloc_autofree_context());
diff --git a/source4/torture/locktest.c b/source4/torture/locktest.c
index 90e2eec2be..119b5186d9 100644
--- a/source4/torture/locktest.c
+++ b/source4/torture/locktest.c
@@ -572,7 +572,7 @@ static void usage(void)
argc -= NSERVERS;
argv += NSERVERS;
- lp_ctx = loadparm_init(talloc_autofree_context());
+ global_loadparm = lp_ctx = loadparm_init(talloc_autofree_context());
lp_load(lp_ctx, dyn_CONFIGFILE);
servers[0] = cli_credentials_init(talloc_autofree_context());
diff --git a/source4/torture/masktest.c b/source4/torture/masktest.c
index d1b853de72..855da54340 100644
--- a/source4/torture/masktest.c
+++ b/source4/torture/masktest.c
@@ -325,7 +325,7 @@ static void usage(void)
argc -= 1;
argv += 1;
- lp_ctx = loadparm_init(talloc_autofree_context());
+ global_loadparm = lp_ctx = loadparm_init(talloc_autofree_context());
lp_load(lp_ctx, dyn_CONFIGFILE);
credentials = cli_credentials_init(talloc_autofree_context());