s3-param Move init_iconv() to loadparm.c

This assists with some dependency loops

Andrew Bartlett

1 files changed, 14 insertions, 0 deletions

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 2ee5988336..08597adf2a 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -7523,6 +7523,20 @@ static bool handle_netbios_name(int snum, const char *pszParmValue, char **ptr)
 	return ret;
 }
 
+/**
+ * Initialize iconv conversion descriptors.
+ *
+ * This is called the first time it is needed, and also called again
+ * every time the configuration is reloaded, because the charset or
+ * codepage might have changed.
+ **/
+static void init_iconv(void)
+{
+	global_iconv_handle = smb_iconv_handle_reinit(NULL, lp_dos_charset(),
+						      lp_unix_charset(), lp_display_charset(),
+						      true, global_iconv_handle);
+}
+
 static bool handle_charset(int snum, const char *pszParmValue, char **ptr)
 {
 	if (strcmp(*ptr, pszParmValue) != 0) {