r26355: Eliminate global_loadparm in more places.

[ambi/samba-autobuild/.git] / source4 / torture / masktest.c

diff --git a/source4/torture/masktest.c b/source4/torture/masktest.c
index 9f47a6839fe6eda9603f861a522aef40737a56c9..dab81937537084da5f7a118c7abc36decdefeb93 100644 (file)
--- 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,14 +303,15 @@ static void usage(void)
        argc -= 1;
        argv += 1;
 
-       lp_load(dyn_CONFIGFILE);
+       lp_ctx = loadparm_init(talloc_autofree_context());
+       lp_load(lp_ctx, dyn_CONFIGFILE);
 
        credentials = cli_credentials_init(talloc_autofree_context());
-       cli_credentials_guess(credentials);
+       cli_credentials_guess(credentials, lp_ctx);
 
        seed = time(NULL);
 
-       close_iconv();
+       reload_charcnv();
 
        while ((opt = getopt(argc, argv, "n:d:U:s:hm:f:aoW:M:vEl:")) != EOF) {
                switch (opt) {
@@ -326,7 +328,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 +360,7 @@ static void usage(void)
                }
        }
 
-       gensec_init(global_loadparm);
+       gensec_init(lp_ctx);
 
        argc -= optind;
        argv += optind;