lib: load_case_tables() -> smb_init_locale()

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

diff --git a/lib/util/charset/charset.h b/lib/util/charset/charset.h
index 821d6b2691c4f21c8265fca4f6eec711e4153f95..66b09a5cade3525bab7e372c233053d1a94c3fe6 100644 (file)
--- 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 9a0943b222aad7ee119f106fc3655506e2b7897d..19319ba75ce33353ecd2311de039b6fcee9df362 100644 (file)
--- 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 f7aac4e11127a5a960cbdb1f6eb6a371ccffad8f..2d2c229349e8994bccfbed2e7057cfa4c24049b1 100644 (file)
--- 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 58cf068a4ae6285a888f6ed50dc654a172e67126..18c720948f861479b99010cbc430b8304e088588 100644 (file)
--- 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 1458cf299f88c02a523f8da130232f078270ef4f..4f24f3761db28cd84367e324674e1f432793f4b2 100644 (file)
--- 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 21110b7151eccef8a647ceda1c1c42b23ec0e747..7161e86468ec2878d7f281805e1565f22bddcb99 100644 (file)
--- 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 629ff427cd3dad723c56055b657c77a09307753e..1e8d0fe27eea5c6be24fa2854656c6d906d23adc 100644 (file)
--- 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 d883c0a55687156c7e90be8ea704d6856baf5cf4..c7e72de5530aaba9df4aa4947debcce3fd69291f 100644 (file)
--- 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 d5673587a059f4cce6131ff6da2e0b985489e50a..45427ceab3e9bd110735f2aaaefc9c22db0c1778 100644 (file)
--- 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 381905d70cc2f2b109e92a61a6b803b288ecd5b9..db89b47dfc70f57472d468db81901de813cbb67c 100644 (file)
--- 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 257c13a14cc28cc1f0c18867b81b5b8925229e82..99a6df6174f7ba3f93436c5fd753cbe7a3a67dc6 100644 (file)
--- 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 a13f6a0113e7bbed15f8e5ac2ba7687da4bb35df..c5af18fe1e981ddbd88742fd44a5d1be96d7ae5f 100644 (file)
--- 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 07a7b6dbe868e3cd4a7a86c8826af9612dec64e5..a23e992a75bf350fdeee36ea2a138e2d8505dcd4 100644 (file)
--- 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 feadcf94120899081e9ed7d3e3fd98a591a08fd7..0acf54f699a950ac4c7f74b1065431f9de4621fa 100644 (file)
--- 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 f33b6e52d28ada17dae3f7ecbf83213c2bad9134..e9c91ffa7eadcdd680f3a8224b2c782bf733a65b 100644 (file)
--- 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 b039ac408bee5df424cfcf596eb0ea0bf4e73aef..2cca2a4f1f90e72c37af1020048ba94c7adc1259 100644 (file)
--- 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 b56e07a037c3d78ebb0d53aaa7664af3630e98e3..7492af1bb3a85a6d8317e47855ed8867bb97941e 100644 (file)
--- 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 f748ac26aab7c7030069fe01ac65e670da509d56..2f9e72720a3c79d45568cce5826995fd646b2c58 100644 (file)
--- 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 b54353613cb65f06d8d1e09fea09001fa25f25fd..4c368b4e4b364a2c7760ab23662d55efe6edfd28 100644 (file)
--- 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 a6a9ec0119de1d0dc22e50c3e2b4893a650b03ed..f53e627a20b8ac6767f185319b815c8943c4f409 100644 (file)
--- 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 a119b3eabe82eb55b17689e37cc5eecb09e0b4cb..dadd30fdb74e7459a36fe2279783b1ff9cc7d266 100644 (file)
--- 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 c49543953eeea9b8ecf79e5e29e49016bcb6cdbe..4124ae57a1830ea9aa7859baacc315c6b705d7b4 100644 (file)
--- 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 555b839899f6a86068d4dc8b29b429bd0cece725..1d53c6e37c34091641c91620c0237299827b44db 100644 (file)
--- 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 22c8f723de75518b926c49603626807f673eb124..aa2bc741aa7eb68853cf79b77c70c091618283e7 100644 (file)
--- 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 f6e71d72040b0b8297c7cc413d9c4b470bbdf9b2..ff5400ed4555608a1634de59e8e4564e2281412a 100644 (file)
--- 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 c77122569c0053bf7209c7db7b05885a4c4df2da..13262edaad1d7c13274ead46b2fe208ea93c1674 100644 (file)
--- 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 3946c080385ac7572ae42796280dd6e7153ad1c7..a23cbd1cfcb4a00c1bed71e469b2dee002d84ae9 100644 (file)
--- 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 cf382bc02594c85e257c3f522979c42e886e93ee..73eb3ebd3ec5f3d2aa79ffc90a6529783debeb71 100644 (file)
--- 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 1f55ec82b44765ee03f61e7b370e2f1a6ab055ed..9b871beda8e017a4fdd91f10487e24a04f8a15a9 100644 (file)
--- 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 28d56478d260b9cb31ffdb323b9bdfc1a7add7d8..c3eb471032a9319e058c9bc53e6c49fb64a5d677 100644 (file)
--- 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 fc7b0710b6d4b6430d128f734adc2e2d2362d6c3..437a5e551bba45cd24ddcc92ce503abba6ede6e9 100644 (file)
--- 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 4c2accd1304d79c352a96b87e745a14eda8b3a04..7cc0a6ec9d3480f24f508d8e3e8bf2fbf3081a41 100644 (file)
--- 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 89f77f760547b7071a82e45dde1883f1e80e0431..e43ddaeeaef168fee8d4e28ae251ea6f687bc1cc 100644 (file)
--- 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 483311cc0da4047fa5ed7ab46b9d2f3ad57ade42..98ec479ac3d9fbb9d6bb441d7c48f99968f4a9db 100644 (file)
--- 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 61efa934a44996e08dd8ca8d6dea25cc2d614ede..80aa18e103754d3e6ff46dbc81d5025a37ca2c35 100644 (file)
--- 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 50518c2f12f4bc3709c17430ceb24fcccd81c055..9499f862673fe93086370cf690e62297dd8256cf 100644 (file)
--- 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 4978c97aaa89b00314c3b72b56084c69c9231b3b..8e7143d67b223c55395df3d851fe02d5ca9293b8 100644 (file)
--- 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 */