From b038240ac72fa34a132eb52bda28bbb80f82c29e Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 4 Dec 2007 00:12:13 +0100 Subject: r26275: return loadparm context in lp_load. (This used to be commit d01f0f4c2037b531b3fd088060717f90e60471e9) --- source4/torture/masktest.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'source4/torture/masktest.c') diff --git a/source4/torture/masktest.c b/source4/torture/masktest.c index 2b3c92db0c..2455361e10 100644 --- a/source4/torture/masktest.c +++ b/source4/torture/masktest.c @@ -281,6 +281,7 @@ static void usage(void) struct smbcli_state *cli; int opt; int seed; + struct loadparm_context *lp_ctx; setlinebuf(stdout); @@ -302,10 +303,10 @@ static void usage(void) argc -= 1; argv += 1; - lp_load(dyn_CONFIGFILE); + lp_load(dyn_CONFIGFILE, &lp_ctx); credentials = cli_credentials_init(talloc_autofree_context()); - cli_credentials_guess(credentials, global_loadparm); + cli_credentials_guess(credentials, lp_ctx); seed = time(NULL); @@ -326,7 +327,7 @@ static void usage(void) verbose++; break; case 'M': - lp_set_cmdline(global_loadparm, "max protocol", optarg); + lp_set_cmdline(lp_ctx, "max protocol", optarg); break; case 'U': cli_credentials_parse_string(credentials, optarg, CRED_SPECIFIED); @@ -358,7 +359,7 @@ static void usage(void) } } - gensec_init(global_loadparm); + gensec_init(lp_ctx); argc -= optind; argv += optind; -- cgit