diff options
| author | Garming Sam <garming@catalyst.net.nz> | 2014-02-20 16:21:19 +1300 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2014-05-07 19:49:16 +0200 |
| commit | 58e8163be545850f6517c807d4b90cb51ea1f98c (patch) | |
| tree | 90e0c534745ce67b5c25074356cb2220f12b9cf9 | |
| parent | 1a921138120027fea677d4e3514e8f95cc56b57d (diff) | |
| download | samba-58e8163be545850f6517c807d4b90cb51ea1f98c.tar.gz samba-58e8163be545850f6517c807d4b90cb51ea1f98c.tar.xz samba-58e8163be545850f6517c807d4b90cb51ea1f98c.zip | |
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>
| -rw-r--r-- | source3/param/loadparm.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 16dd70f2654..5f1470a321d 100644 --- 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; } |