Merge case handling table changes from 3.0 to HEAD.

(This used to be commit 263407e132dcb1f7fc85cded9842e60918f8ef4b)

diff --git a/source3/lib/util_unistr.c b/source3/lib/util_unistr.c
index 812859000a9f73eeb98212b57c39e0b507e90c16..08bb03986f145eb62868fb9c544e129163dc28ff 100644 (file)
--- a/source3/lib/util_unistr.c
+++ b/source3/lib/util_unistr.c
@@ -40,9 +40,12 @@ static uint8 *valid_table;
 static uint8 doschar_table[8192]; /* 65536 characters / 8 bits/byte */
 
 
-/*******************************************************************
-load the case handling tables
-********************************************************************/
+/**
+ * Load or generate the case handling tables.
+ *
+ * The case tables are defined in UCS2 and don't depend on any
+ * configured parameters, so they never need to be reloaded.
+ **/
 void load_case_tables(void)
 {
        static int initialised;
@@ -91,14 +94,9 @@ void load_case_tables(void)
   see if a ucs2 character can be mapped correctly to a dos character
   and mapped back to the same character in ucs2
 */
-static int check_dos_char(smb_ucs2_t c)
+int check_dos_char(smb_ucs2_t c)
 {
-       static int initialized = False;
-
-       if (!initialized) {
-               initialized = True;
-               init_doschar_table();
-       }
+       lazy_initialize_conv();
        
        /* Find the right byte, and right bit within the byte; return
         * 1 or 0 */