s3:param: Use new utility function to hide use of global_iconv_handle
authorJeremy Allison <jra@samba.org>
Tue, 11 Apr 2017 22:47:17 +0000 (15:47 -0700)
committerAndreas Schneider <asn@cryptomilk.org>
Tue, 18 Apr 2017 09:47:17 +0000 (11:47 +0200)
Add error return check.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
source3/param/loadparm.c

index b543a6f48c9ea9b5aba010668c6d87f37820da3e..3c597ec2f404b35b6651cba22376eead4ca88dcc 100644 (file)
@@ -2368,9 +2368,14 @@ bool lp_file_list_changed(void)
  **/
 static void init_iconv(void)
 {
-       global_iconv_handle = smb_iconv_handle_reinit(NULL, lp_dos_charset(),
-                                                     lp_unix_charset(),
-                                                     true, global_iconv_handle);
+       struct smb_iconv_handle *ret = NULL;
+
+       ret = reinit_iconv_handle(NULL,
+                                 lp_dos_charset(),
+                                 lp_unix_charset());
+       if (ret == NULL) {
+               smb_panic("reinit_iconv_handle failed");
+       }
 }
 
 /***************************************************************************