diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-04 00:12:13 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:48:01 +0100 |
| commit | b038240ac72fa34a132eb52bda28bbb80f82c29e (patch) | |
| tree | 8870bbb7b50ce698806bc0f2210204b98e38c19a /source4/torture/locktest.c | |
| parent | fc2f06d31b6b52c5cbd83f34a34e5107649a5134 (diff) | |
| download | samba-b038240ac72fa34a132eb52bda28bbb80f82c29e.tar.gz | |
r26275: return loadparm context in lp_load.
(This used to be commit d01f0f4c2037b531b3fd088060717f90e60471e9)
Diffstat (limited to 'source4/torture/locktest.c')
| -rw-r--r-- | source4/torture/locktest.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/source4/torture/locktest.c b/source4/torture/locktest.c index 381abaebc61..2aa074c6c35 100644 --- a/source4/torture/locktest.c +++ b/source4/torture/locktest.c @@ -543,6 +543,7 @@ static void usage(void) int opt; int seed, server; int username_count=0; + struct loadparm_context *lp_ctx; setlinebuf(stdout); @@ -563,12 +564,12 @@ static void usage(void) argc -= NSERVERS; argv += NSERVERS; - lp_load(dyn_CONFIGFILE); + lp_load(dyn_CONFIGFILE, &lp_ctx); servers[0] = cli_credentials_init(talloc_autofree_context()); servers[1] = cli_credentials_init(talloc_autofree_context()); - cli_credentials_guess(servers[0], global_loadparm); - cli_credentials_guess(servers[1], global_loadparm); + cli_credentials_guess(servers[0], lp_ctx); + cli_credentials_guess(servers[1], lp_ctx); seed = time(NULL); @@ -617,10 +618,10 @@ static void usage(void) exact_error_codes = true; break; case 'l': - lp_set_cmdline(global_loadparm, "torture:unclist", optarg); + lp_set_cmdline(lp_ctx, "torture:unclist", optarg); break; case 'W': - lp_set_cmdline(global_loadparm, "workgroup", optarg); + lp_set_cmdline(lp_ctx, "workgroup", optarg); break; case 'h': usage(); @@ -639,7 +640,7 @@ static void usage(void) servers[1] = servers[0]; } - gensec_init(global_loadparm); + gensec_init(lp_ctx); argc -= optind; argv += optind; |