r12555: Fix more load_case_table swegfaults. Arggg.

What I'd give for a global constructor...
Jeremy.
(This used to be commit c970d7d0a5ba225465dfb0980989b8817b17c643)

diff --git a/source3/client/client.c b/source3/client/client.c
index f95bbea6718a78dced5fd252014ca30ee767889e..7ac64970f8128c76823bc0eb7c0ca3d7ca33d4a0 100644 (file)
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -3326,6 +3326,7 @@ static int do_message_op(void)
                POPT_TABLEEND
        };
        
+       load_case_tables();
 
 #ifdef KANJI
        pstrcpy(term_code, KANJI);

diff --git a/source3/nsswitch/wbinfo.c b/source3/nsswitch/wbinfo.c
index c55f4bb43190a4d86e468c929ceb86253ca6669e..f3819b6f51995d0c5c9e1a0ac5f2e2dc15939eff 100644 (file)
--- a/source3/nsswitch/wbinfo.c
+++ b/source3/nsswitch/wbinfo.c
@@ -1022,6 +1022,7 @@ int main(int argc, char **argv)
        };
 
        /* Samba client initialisation */
+       load_case_tables();
 
        if (!lp_load(dyn_CONFIGFILE, True, False, False)) {
                d_fprintf(stderr, "wbinfo: error opening config file %s. Error was %s\n",

diff --git a/source3/utils/eventlogadm.c b/source3/utils/eventlogadm.c
index a0fc4bcf9d4fb53a5c4a4437c6cf72f72bf3dfd9..eef7cde3771f650fb0ee0f58109e90762ea01dc2 100644 (file)
--- a/source3/utils/eventlogadm.c
+++ b/source3/utils/eventlogadm.c
@@ -166,6 +166,8 @@ int main( int argc, char *argv[] )
 
        fstring opname;
 
+       load_case_tables();
+
        opt_debug = 0;          /* todo set this from getopts */
 
        lp_load( dyn_CONFIGFILE, True, False, False );

diff --git a/source3/utils/ntlm_auth.c b/source3/utils/ntlm_auth.c
index 433ba06982473f0c3970c474ae55458bd4f64033..65dbfb71650018840fdbb31400dac9a962c01a6a 100644 (file)
--- a/source3/utils/ntlm_auth.c
+++ b/source3/utils/ntlm_auth.c
@@ -1752,6 +1752,7 @@ enum {
        };
 
        /* Samba client initialisation */
+       load_case_tables();
 
        dbf = x_stderr;
        

diff --git a/source3/utils/pdbedit.c b/source3/utils/pdbedit.c
index 9c292bd212ab91c89d7a63c6d36a9822805376fb..ddf0eea169b5742f57f2b744d6c4ec0608e7cb8c 100644 (file)
--- a/source3/utils/pdbedit.c
+++ b/source3/utils/pdbedit.c
@@ -775,6 +775,8 @@ int main (int argc, char **argv)
                POPT_TABLEEND
        };
        
+       load_case_tables();
+
        setup_logging("pdbedit", True);
        
        pc = poptGetContext(NULL, argc, (const char **) argv, long_options,

diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c
index fd1d3cbf89cf2b5e5cb1787572d13504374e450b..cbbd7adaab39d500a4d5948385d9ff48c9316cf0 100644 (file)
--- a/source3/utils/smbcacls.c
+++ b/source3/utils/smbcacls.c
@@ -818,6 +818,8 @@ static struct cli_state *connect_one(const char *share)
 
        struct cli_state *cli;
 
+       load_case_tables();
+
        ctx=talloc_init("main");
 
        /* set default debug level to 1 regardless of what smb.conf sets */

diff --git a/source3/utils/smbcquotas.c b/source3/utils/smbcquotas.c
index be7c2c64e6a23233c55f3b9157f682366621f16e..f8e33131555cb74f3f8a0b325effa779975ea84c 100644 (file)
--- a/source3/utils/smbcquotas.c
+++ b/source3/utils/smbcquotas.c
@@ -421,6 +421,8 @@ FSQFLAGS:QUOTA_ENABLED/DENY_DISK/LOG_SOFTLIMIT/LOG_HARD_LIMIT", "SETSTRING" },
                { NULL }
        };
 
+       load_case_tables();
+
        ZERO_STRUCT(qt);
 
        /* set default debug level to 1 regardless of what smb.conf sets */

diff --git a/source3/utils/smbget.c b/source3/utils/smbget.c
index 9d44017bd357bc6a5c25853c1e8711f75106bfc9..4a2670e0c169b5241c1a93c6c8ec25c3d1730277 100644 (file)
--- a/source3/utils/smbget.c
+++ b/source3/utils/smbget.c
@@ -544,6 +544,8 @@ int main(int argc, const char **argv)
        };
        poptContext pc;
 
+       load_case_tables();
+
        /* only read rcfile if it exists */
        asprintf(&rcfile, "%s/.smbgetrc", getenv("HOME"));
        if(access(rcfile, F_OK) == 0) 

diff --git a/source3/utils/smbtree.c b/source3/utils/smbtree.c
index 00f6a74f2f28d81ebbc412c1c0d0f5b3b038b282..3755b7f8e55c487418ecb7b974d678718952ba7f 100644 (file)
--- a/source3/utils/smbtree.c
+++ b/source3/utils/smbtree.c
@@ -203,6 +203,7 @@ static BOOL print_tree(struct user_auth_info *user_info)
        poptContext pc;
        
        /* Initialise samba stuff */
+       load_case_tables();
 
        setlinebuf(stdout);
 

diff --git a/source3/utils/status.c b/source3/utils/status.c
index 2c5756106a25b4340123eabfd16d3feeab21fdac..f19a217aa6581090dfaadb06571342ac6bd07cdd 100644 (file)
--- a/source3/utils/status.c
+++ b/source3/utils/status.c
@@ -613,6 +613,8 @@ static int traverse_sessionid(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf, vo
                POPT_TABLEEND
        };
 
+       load_case_tables();
+
        setup_logging(argv[0],True);
        
        dbf = x_stderr;

diff --git a/source3/utils/testparm.c b/source3/utils/testparm.c
index e097ea34d61b448ba46822bde013318cf3f95576..f5c835725a48f0d09774515c528c90bd10bf1b85 100644 (file)
--- a/source3/utils/testparm.c
+++ b/source3/utils/testparm.c
@@ -230,6 +230,8 @@ via the %%o substitution. With encrypted passwords this is not possible.\n", lp_
                POPT_TABLEEND
        };
 
+       load_case_tables();
+
        pc = poptGetContext(NULL, argc, argv, long_options, 
                            POPT_CONTEXT_KEEP_FIRST);
        poptSetOtherOptionHelp(pc, "[OPTION...] <config-file> [host-name] [host-ip]");