r26429: Avoid use of global_smb_iconv_convenience.

[sfrench/samba-autobuild/.git] / source4 / torture / basic / utable.c

diff --git a/source4/torture/basic/utable.c b/source4/torture/basic/utable.c
index 244378dbc9df997fc1a3153ee12d14dca86e4571..51b7b39309b1c30ea872e50ac9d1d6f0d4f3ab56 100644 (file)
--- a/source4/torture/basic/utable.c
+++ b/source4/torture/basic/utable.c
@@ -24,6 +24,7 @@
 #include "libcli/libcli.h"
 #include "torture/util.h"
 #include "pstring.h"
+#include "param/param.h"
 
 bool torture_utable(struct torture_context *tctx, 
                                        struct smbcli_state *cli)
@@ -49,7 +50,7 @@ bool torture_utable(struct torture_context *tctx,
                SSVAL(c2, 0, c);
                fstrcpy(fname, "\\utable\\x");
                p = fname+strlen(fname);
-               len = convert_string(global_smb_iconv_convenience, CH_UTF16, CH_UNIX, 
+               len = convert_string(lp_iconv_convenience(global_loadparm), CH_UTF16, CH_UNIX, 
                                     c2, 2, 
                                     p, sizeof(fname)-strlen(fname));
                p[len] = 0;
@@ -108,7 +109,7 @@ static char *form_name(int c)
        p = fname+strlen(fname);
        SSVAL(c2, 0, c);
 
-       len = convert_string(global_smb_iconv_convenience, CH_UTF16, CH_UNIX, 
+       len = convert_string(lp_iconv_convenience(global_loadparm), CH_UTF16, CH_UNIX, 
                             c2, 2, 
                             p, sizeof(fname)-strlen(fname));
        p[len] = 0;