sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-04 17:47:26 +03:00
Code

param: inline init_iconv into handle [dos] charset

Browse Source 
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Garming Sam 2014-02-20 16:21:19 +13:00 committed by Jeremy Allison
parent 1a92113812
commit 58e8163be5
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source3/param/loadparm.c
View File

@ -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;
}