lib: load_case_tables() -> smb_init_locale()

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

37 files changed, 37 insertions, 37 deletions

diff --git a/lib/util/charset/charset.h b/lib/util/charset/charset.h
index 821d6b2691c..66b09a5cade 100644
--- a/lib/util/charset/charset.h
+++ b/lib/util/charset/charset.h
@@ -222,7 +222,7 @@ size_t smb_iconv(smb_iconv_t cd,
 smb_iconv_t smb_iconv_open_ex(TALLOC_CTX *mem_ctx, const char *tocode, 
 			      const char *fromcode, bool use_builtin_handlers);
 
-void load_case_tables(void);
+void smb_init_locale(void);
 
 /* The following definitions come from util_unistr_w.c  */
 
diff --git a/lib/util/charset/codepoints.c b/lib/util/charset/codepoints.c
index 9a0943b222a..19319ba75ce 100644
--- a/lib/util/charset/codepoints.c
+++ b/lib/util/charset/codepoints.c
@@ -16424,7 +16424,7 @@ static const uint16_t upcase_table[] = {
 	0xfff8,0xfff9,0xfffa,0xfffb,0xfffc,0xfffd,0xfffe,0xffff
 };
 
-void load_case_tables(void)
+void smb_init_locale(void)
 {
 	/* This is a useful global hook where we can ensure that the
 	 * locale is set from the environment.  This is needed so that
diff --git a/librpc/tools/ndrdump.c b/librpc/tools/ndrdump.c
index f7aac4e1112..2d2c229349e 100644
--- a/librpc/tools/ndrdump.c
+++ b/librpc/tools/ndrdump.c
@@ -227,7 +227,7 @@ static NTSTATUS ndrdump_pull_and_print_pipes(const char *function,
 	ndr_table_init();
 
 	/* Initialise samba stuff */
-	load_case_tables();
+	smb_init_locale();
 
 	setlinebuf(stdout);
 
diff --git a/nsswitch/wbinfo.c b/nsswitch/wbinfo.c
index 58cf068a4ae..18c720948f8 100644
--- a/nsswitch/wbinfo.c
+++ b/nsswitch/wbinfo.c
@@ -2224,7 +2224,7 @@ int main(int argc, const char **argv, char **envp)
 	};
 
 	/* Samba client initialisation */
-	load_case_tables();
+	smb_init_locale();
 
 
 	/* Parse options */
diff --git a/source3/client/client.c b/source3/client/client.c
index 1458cf299f8..4f24f3761db 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -5428,7 +5428,7 @@ int main(int argc,char *argv[])
 
         /* set default debug level to 1 regardless of what smb.conf sets */
 	setup_logging( "smbclient", DEBUG_DEFAULT_STDERR );
-	load_case_tables();
+	smb_init_locale();
 
 	lp_set_cmdline("log level", "1");
 
diff --git a/source3/client/smbspool.c b/source3/client/smbspool.c
index 21110b7151e..7161e86468e 100644
--- a/source3/client/smbspool.c
+++ b/source3/client/smbspool.c
@@ -252,7 +252,7 @@ main(int argc,			/* I - Number of command-line arguments */
 
 	setup_logging("smbspool", DEBUG_STDOUT);
 
-	load_case_tables();
+	smb_init_locale();
 
 	if (!lp_load_client(get_dyn_CONFIGFILE())) {
 		fprintf(stderr, "ERROR: Can't load %s - run testparm to debug it\n", get_dyn_CONFIGFILE());
diff --git a/source3/lib/smbconf/testsuite.c b/source3/lib/smbconf/testsuite.c
index 629ff427cd3..1e8d0fe27ee 100644
--- a/source3/lib/smbconf/testsuite.c
+++ b/source3/lib/smbconf/testsuite.c
@@ -296,7 +296,7 @@ int main(int argc, const char **argv)
 		{0, 0, 0, 0}
 	};
 
-	load_case_tables();
+	smb_init_locale();
 	setup_logging(argv[0], DEBUG_STDERR);
 
 	/* parse options */
diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c
index d883c0a5568..c7e72de5530 100644
--- a/source3/nmbd/nmbd.c
+++ b/source3/nmbd/nmbd.c
@@ -819,7 +819,7 @@ static bool open_sockets(bool isdaemon, int port)
 
 	setup_logging(argv[0], DEBUG_DEFAULT_STDOUT);
 
-	load_case_tables();
+	smb_init_locale();
 
 	global_nmb_port = NMB_PORT;
 
diff --git a/source3/param/test_lp_load.c b/source3/param/test_lp_load.c
index d5673587a05..45427ceab3e 100644
--- a/source3/param/test_lp_load.c
+++ b/source3/param/test_lp_load.c
@@ -38,7 +38,7 @@ int main(int argc, const char **argv)
 
 	TALLOC_CTX *frame = talloc_stackframe();
 
-	load_case_tables();
+	smb_init_locale();
 	lp_set_cmdline("log level", "0");
 
 	pc = poptGetContext(NULL, argc, argv, long_options,
diff --git a/source3/rpcclient/rpcclient.c b/source3/rpcclient/rpcclient.c
index 381905d70cc..db89b47dfc7 100644
--- a/source3/rpcclient/rpcclient.c
+++ b/source3/rpcclient/rpcclient.c
@@ -932,7 +932,7 @@ out_free:
 		POPT_TABLEEND
 	};
 
-	load_case_tables();
+	smb_init_locale();
 
 	zero_sockaddr(&server_ss);
 
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 257c13a14cc..99a6df6174f 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -1124,7 +1124,7 @@ extern void build_options(bool screen);
 
 	setup_logging(argv[0], DEBUG_DEFAULT_STDOUT);
 
-	load_case_tables();
+	smb_init_locale();
 
 	set_smbd_shim(&smbd_shim_fns);
 
diff --git a/source3/torture/masktest.c b/source3/torture/masktest.c
index a13f6a0113e..c5af18fe1e9 100644
--- a/source3/torture/masktest.c
+++ b/source3/torture/masktest.c
@@ -482,7 +482,7 @@ static void usage(void)
 	argc -= 1;
 	argv += 1;
 
-	load_case_tables();
+	smb_init_locale();
 	lp_load_global(get_dyn_CONFIGFILE());
 	load_interfaces();
 
diff --git a/source3/torture/msgtest.c b/source3/torture/msgtest.c
index 07a7b6dbe86..a23e992a75b 100644
--- a/source3/torture/msgtest.c
+++ b/source3/torture/msgtest.c
@@ -48,7 +48,7 @@ static void pong_message(struct messaging_context *msg_ctx,
 	int ret;
 	TALLOC_CTX *frame = talloc_stackframe();
 
-	load_case_tables();
+	smb_init_locale();
 
 	setup_logging(argv[0], DEBUG_STDOUT);
 
diff --git a/source3/torture/pdbtest.c b/source3/torture/pdbtest.c
index feadcf94120..0acf54f699a 100644
--- a/source3/torture/pdbtest.c
+++ b/source3/torture/pdbtest.c
@@ -459,7 +459,7 @@ int main(int argc, const char **argv)
 
 	ctx = talloc_stackframe();
 
-	load_case_tables();
+	smb_init_locale();
 
 	pc = poptGetContext("pdbtest", argc, argv, long_options, 0);
 
diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index f33b6e52d28..e9c91ffa7ea 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -9749,7 +9749,7 @@ static void usage(void)
 
 	setup_logging("smbtorture", DEBUG_STDOUT);
 
-	load_case_tables();
+	smb_init_locale();
 	fault_setup();
 
 	if (is_default_dyn_CONFIGFILE()) {
diff --git a/source3/torture/vfstest.c b/source3/torture/vfstest.c
index b039ac408be..2cca2a4f1f9 100644
--- a/source3/torture/vfstest.c
+++ b/source3/torture/vfstest.c
@@ -487,7 +487,7 @@ int main(int argc, const char *argv[])
 		.exit_server_cleanly = vfstest_exit_server_cleanly,
 	};
 
-	load_case_tables();
+	smb_init_locale();
 
 	setlinebuf(stdout);
 
diff --git a/source3/utils/dbwrap_tool.c b/source3/utils/dbwrap_tool.c
index b56e07a037c..7492af1bb3a 100644
--- a/source3/utils/dbwrap_tool.c
+++ b/source3/utils/dbwrap_tool.c
@@ -435,7 +435,7 @@ int main(int argc, const char **argv)
 	int extra_argc = 0;
 	poptContext pc;
 
-	load_case_tables();
+	smb_init_locale();
 	lp_set_cmdline("log level", "0");
 	setup_logging(argv[0], DEBUG_STDERR);
 
diff --git a/source3/utils/dbwrap_torture.c b/source3/utils/dbwrap_torture.c
index f748ac26aab..2f9e72720a3 100644
--- a/source3/utils/dbwrap_torture.c
+++ b/source3/utils/dbwrap_torture.c
@@ -261,7 +261,7 @@ int main(int argc, const char *argv[])
 		setlinebuf(stdout);
 	}
 
-	load_case_tables();
+	smb_init_locale();
 
 	setup_logging(argv[0], DEBUG_STDERR);
 	lp_set_cmdline("log level", "0");
diff --git a/source3/utils/eventlogadm.c b/source3/utils/eventlogadm.c
index b54353613cb..4c368b4e4b3 100644
--- a/source3/utils/eventlogadm.c
+++ b/source3/utils/eventlogadm.c
@@ -427,7 +427,7 @@ int main( int argc, char *argv[] )
 
 	fstring opname;
 
-	load_case_tables();
+	smb_init_locale();
 
 	opt_debug = 0;		/* todo set this from getopts */
 
diff --git a/source3/utils/net.c b/source3/utils/net.c
index a6a9ec0119d..f53e627a20b 100644
--- a/source3/utils/net.c
+++ b/source3/utils/net.c
@@ -839,7 +839,7 @@ static struct functable net_func[] = {
 
 	setup_logging(argv[0], DEBUG_STDERR);
 
-	load_case_tables();
+	smb_init_locale();
 
 	setlocale(LC_ALL, "");
 #if defined(HAVE_BINDTEXTDOMAIN)
diff --git a/source3/utils/nmblookup.c b/source3/utils/nmblookup.c
index a119b3eabe8..dadd30fdb74 100644
--- a/source3/utils/nmblookup.c
+++ b/source3/utils/nmblookup.c
@@ -247,7 +247,7 @@ int main(int argc, const char *argv[])
 
 	*lookup = 0;
 
-	load_case_tables();
+	smb_init_locale();
 
 	setup_logging(argv[0], DEBUG_STDOUT);
 
diff --git a/source3/utils/ntlm_auth.c b/source3/utils/ntlm_auth.c
index c49543953ee..4124ae57a18 100644
--- a/source3/utils/ntlm_auth.c
+++ b/source3/utils/ntlm_auth.c
@@ -2770,7 +2770,7 @@ enum {
 	};
 
 	/* Samba client initialisation */
-	load_case_tables();
+	smb_init_locale();
 
 	setup_logging("ntlm_auth", DEBUG_STDERR);
 
diff --git a/source3/utils/pdbedit.c b/source3/utils/pdbedit.c
index 555b839899f..1d53c6e37c3 100644
--- a/source3/utils/pdbedit.c
+++ b/source3/utils/pdbedit.c
@@ -1064,7 +1064,7 @@ int main(int argc, const char **argv)
 
 	bin = bout = NULL;
 
-	load_case_tables();
+	smb_init_locale();
 
 	setup_logging("pdbedit", DEBUG_STDOUT);
 
diff --git a/source3/utils/profiles.c b/source3/utils/profiles.c
index 22c8f723de7..aa2bc741aa7 100644
--- a/source3/utils/profiles.c
+++ b/source3/utils/profiles.c
@@ -219,7 +219,7 @@ int main( int argc, const char *argv[] )
 	};
 	poptContext pc;
 
-	load_case_tables();
+	smb_init_locale();
 
 	/* setup logging options */
 
diff --git a/source3/utils/sharesec.c b/source3/utils/sharesec.c
index f6e71d72040..ff5400ed455 100644
--- a/source3/utils/sharesec.c
+++ b/source3/utils/sharesec.c
@@ -537,7 +537,7 @@ int main(int argc, const char *argv[])
 	/* set default debug level to 1 regardless of what smb.conf sets */
 	setup_logging( "sharesec", DEBUG_STDERR);
 
-	load_case_tables();
+	smb_init_locale();
 
 	lp_set_cmdline("log level", "1");
 
diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c
index c77122569c0..13262edaad1 100644
--- a/source3/utils/smbcacls.c
+++ b/source3/utils/smbcacls.c
@@ -1400,7 +1400,7 @@ int main(int argc, char *argv[])
 	char *server;
 	struct user_auth_info *auth_info;
 
-	load_case_tables();
+	smb_init_locale();
 
 	/* set default debug level to 1 regardless of what smb.conf sets */
 	setup_logging( "smbcacls", DEBUG_STDERR);
diff --git a/source3/utils/smbcontrol.c b/source3/utils/smbcontrol.c
index 3946c080385..a23cbd1cfcb 100644
--- a/source3/utils/smbcontrol.c
+++ b/source3/utils/smbcontrol.c
@@ -1550,7 +1550,7 @@ int main(int argc, const char **argv)
 	TALLOC_CTX *frame = talloc_stackframe();
 	int ret = 0;
 
-	load_case_tables();
+	smb_init_locale();
 
 	setup_logging(argv[0], DEBUG_STDOUT);
 
diff --git a/source3/utils/smbcquotas.c b/source3/utils/smbcquotas.c
index cf382bc0259..73eb3ebd3ec 100644
--- a/source3/utils/smbcquotas.c
+++ b/source3/utils/smbcquotas.c
@@ -589,7 +589,7 @@ FSQFLAGS:QUOTA_ENABLED/DENY_DISK/LOG_SOFTLIMIT/LOG_HARD_LIMIT", "SETSTRING" },
 		{ NULL }
 	};
 
-	load_case_tables();
+	smb_init_locale();
 
 	ZERO_STRUCT(qt);
 
diff --git a/source3/utils/smbfilter.c b/source3/utils/smbfilter.c
index 1f55ec82b44..9b871beda8e 100644
--- a/source3/utils/smbfilter.c
+++ b/source3/utils/smbfilter.c
@@ -323,7 +323,7 @@ int main(int argc, char *argv[])
 	const char *configfile;
 	TALLOC_CTX *frame = talloc_stackframe();
 
-	load_case_tables();
+	smb_init_locale();
 
 	setup_logging(argv[0], DEBUG_STDOUT);
 
diff --git a/source3/utils/smbget.c b/source3/utils/smbget.c
index 28d56478d26..c3eb471032a 100644
--- a/source3/utils/smbget.c
+++ b/source3/utils/smbget.c
@@ -619,7 +619,7 @@ int main(int argc, const char **argv)
 	};
 	poptContext pc;
 
-	load_case_tables();
+	smb_init_locale();
 
 	/* only read rcfile if it exists */
 	if (asprintf(&rcfile, "%s/.smbgetrc", getenv("HOME")) == -1) {
diff --git a/source3/utils/smbpasswd.c b/source3/utils/smbpasswd.c
index fc7b0710b6d..437a5e551bb 100644
--- a/source3/utils/smbpasswd.c
+++ b/source3/utils/smbpasswd.c
@@ -597,7 +597,7 @@ int main(int argc, char **argv)
 		local_flags = LOCAL_AM_ROOT;
 	}
 
-	load_case_tables();
+	smb_init_locale();
 
 	local_flags = process_options(argc, argv, local_flags);
 
diff --git a/source3/utils/smbta-util.c b/source3/utils/smbta-util.c
index 4c2accd1304..7cc0a6ec9d3 100644
--- a/source3/utils/smbta-util.c
+++ b/source3/utils/smbta-util.c
@@ -193,7 +193,7 @@ static void process_arguments(int argc, char **argv)
 int main(int argc, char **argv)
 {
 	sec_init();
-	load_case_tables();
+	smb_init_locale();
 
 	if (!lp_load_initial_only(get_dyn_CONFIGFILE())) {
 		fprintf(stderr, "Can't load %s - run testparm to debug it\n",
diff --git a/source3/utils/smbtree.c b/source3/utils/smbtree.c
index 89f77f76054..e43ddaeeaef 100644
--- a/source3/utils/smbtree.c
+++ b/source3/utils/smbtree.c
@@ -302,7 +302,7 @@ int main(int argc, char *argv[])
 	poptContext pc;
 
 	/* Initialise samba stuff */
-	load_case_tables();
+	smb_init_locale();
 
 	setlinebuf(stdout);
 
diff --git a/source3/utils/split_tokens.c b/source3/utils/split_tokens.c
index 483311cc0da..98ec479ac3d 100644
--- a/source3/utils/split_tokens.c
+++ b/source3/utils/split_tokens.c
@@ -40,7 +40,7 @@ int main(int argc, const char *argv[])
 		POPT_TABLEEND
 	};
 
-	load_case_tables();
+	smb_init_locale();
 
 	pc = poptGetContext(NULL, argc, argv, long_options,
 			    POPT_CONTEXT_KEEP_FIRST);
diff --git a/source3/utils/status.c b/source3/utils/status.c
index 61efa934a44..80aa18e1037 100644
--- a/source3/utils/status.c
+++ b/source3/utils/status.c
@@ -376,7 +376,7 @@ int main(int argc, const char *argv[])
 	bool ok;
 
 	sec_init();
-	load_case_tables();
+	smb_init_locale();
 
 	setup_logging(argv[0], DEBUG_STDERR);
 
diff --git a/source3/utils/testparm.c b/source3/utils/testparm.c
index 50518c2f12f..9499f862673 100644
--- a/source3/utils/testparm.c
+++ b/source3/utils/testparm.c
@@ -454,7 +454,7 @@ static void do_per_share_checks(int s)
 
 	TALLOC_CTX *frame = talloc_stackframe();
 
-	load_case_tables();
+	smb_init_locale();
 	/*
 	 * Set the default debug level to 2.
 	 * Allow it to be overridden by the command line,
diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c
index 4978c97aaa8..8e7143d67b2 100644
--- a/source3/winbindd/winbindd.c
+++ b/source3/winbindd/winbindd.c
@@ -1436,7 +1436,7 @@ int main(int argc, const char **argv)
 	fault_setup();
 	dump_core_setup("winbindd", lp_logfile(talloc_tos()));
 
-	load_case_tables();
+	smb_init_locale();
 
 	/* Initialise for running in non-root mode */