r12555: Fix more load_case_table swegfaults. Arggg.

What I'd give for a global constructor...
Jeremy.

11 files changed, 18 insertions, 0 deletions

diff --git a/source/client/client.c b/source/client/client.c
index f95bbea6718..7ac64970f81 100644
--- a/source/client/client.c
+++ b/source/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/source/nsswitch/wbinfo.c b/source/nsswitch/wbinfo.c
index c55f4bb4319..f3819b6f519 100644
--- a/source/nsswitch/wbinfo.c
+++ b/source/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/source/utils/eventlogadm.c b/source/utils/eventlogadm.c
index a0fc4bcf9d4..eef7cde3771 100644
--- a/source/utils/eventlogadm.c
+++ b/source/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/source/utils/ntlm_auth.c b/source/utils/ntlm_auth.c
index 433ba069824..65dbfb71650 100644
--- a/source/utils/ntlm_auth.c
+++ b/source/utils/ntlm_auth.c
@@ -1752,6 +1752,7 @@ enum {
 	};
 
 	/* Samba client initialisation */
+	load_case_tables();
 
 	dbf = x_stderr;
 	
diff --git a/source/utils/pdbedit.c b/source/utils/pdbedit.c
index 9c292bd212a..ddf0eea169b 100644
--- a/source/utils/pdbedit.c
+++ b/source/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/source/utils/smbcacls.c b/source/utils/smbcacls.c
index fd1d3cbf89c..cbbd7adaab3 100644
--- a/source/utils/smbcacls.c
+++ b/source/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/source/utils/smbcquotas.c b/source/utils/smbcquotas.c
index be7c2c64e6a..f8e33131555 100644
--- a/source/utils/smbcquotas.c
+++ b/source/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/source/utils/smbget.c b/source/utils/smbget.c
index 9d44017bd35..4a2670e0c16 100644
--- a/source/utils/smbget.c
+++ b/source/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/source/utils/smbtree.c b/source/utils/smbtree.c
index 00f6a74f2f2..3755b7f8e55 100644
--- a/source/utils/smbtree.c
+++ b/source/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/source/utils/status.c b/source/utils/status.c
index 2c5756106a2..f19a217aa65 100644
--- a/source/utils/status.c
+++ b/source/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/source/utils/testparm.c b/source/utils/testparm.c
index e097ea34d61..f5c835725a4 100644
--- a/source/utils/testparm.c
+++ b/source/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]");