param: inline init_iconv into handle [dos] charset

Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 16dd70f26540aa8d9790b5cfdd05d2ad5160ac95..5f1470a321d39bbb4e404620f5e1d3893c656474 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -2464,7 +2464,9 @@ static bool handle_charset(struct loadparm_context *unused, int snum, const char
 {
        if (*ptr == NULL || strcmp(*ptr, pszParmValue) != 0) {
                string_set(Globals.ctx, ptr, pszParmValue);
-               init_iconv();
+               global_iconv_handle = smb_iconv_handle_reinit(NULL, lp_dos_charset(),
+                                                     lp_unix_charset(),
+                                                     true, global_iconv_handle);
        }
        return true;
 }
@@ -2501,7 +2503,9 @@ static bool handle_dos_charset(struct loadparm_context *unused, int snum, const
                        pszParmValue = DEFAULT_DOS_CHARSET;
                }
                string_set(Globals.ctx, ptr, pszParmValue);
-               init_iconv();
+               global_iconv_handle = smb_iconv_handle_reinit(NULL, lp_dos_charset(),
+                                                     lp_unix_charset(),
+                                                     true, global_iconv_handle);
        }
        return true;
 }