Author: jra
Date: 2005-12-28 22:48:57 +0000 (Wed, 28 Dec 2005)
New Revision: 12557

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=12557

Log:
Fix more load_case_table swegfaults. Arggg.
What I'd give for a global constructor...
Jeremy.

Modified:
   trunk/source/client/client.c
   trunk/source/nsswitch/wbinfo.c
   trunk/source/utils/eventlogadm.c
   trunk/source/utils/ntlm_auth.c
   trunk/source/utils/pdbedit.c
   trunk/source/utils/smbcacls.c
   trunk/source/utils/smbcquotas.c
   trunk/source/utils/smbget.c
   trunk/source/utils/smbtree.c
   trunk/source/utils/status.c
   trunk/source/utils/testparm.c


Changeset:
Modified: trunk/source/client/client.c
===================================================================
--- trunk/source/client/client.c        2005-12-28 22:49:02 UTC (rev 12556)
+++ trunk/source/client/client.c        2005-12-28 22:48:57 UTC (rev 12557)
@@ -3326,6 +3326,7 @@
                POPT_TABLEEND
        };
        
+       load_case_tables();
 
 #ifdef KANJI
        pstrcpy(term_code, KANJI);

Modified: trunk/source/nsswitch/wbinfo.c
===================================================================
--- trunk/source/nsswitch/wbinfo.c      2005-12-28 22:49:02 UTC (rev 12556)
+++ trunk/source/nsswitch/wbinfo.c      2005-12-28 22:48:57 UTC (rev 12557)
@@ -1145,6 +1145,7 @@
        };
 
        /* 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",

Modified: trunk/source/utils/eventlogadm.c
===================================================================
--- trunk/source/utils/eventlogadm.c    2005-12-28 22:49:02 UTC (rev 12556)
+++ trunk/source/utils/eventlogadm.c    2005-12-28 22:48:57 UTC (rev 12557)
@@ -166,6 +166,8 @@
 
        fstring opname;
 
+       load_case_tables();
+
        opt_debug = 0;          /* todo set this from getopts */
 
        lp_load( dyn_CONFIGFILE, True, False, False );

Modified: trunk/source/utils/ntlm_auth.c
===================================================================
--- trunk/source/utils/ntlm_auth.c      2005-12-28 22:49:02 UTC (rev 12556)
+++ trunk/source/utils/ntlm_auth.c      2005-12-28 22:48:57 UTC (rev 12557)
@@ -1752,6 +1752,7 @@
        };
 
        /* Samba client initialisation */
+       load_case_tables();
 
        dbf = x_stderr;
        

Modified: trunk/source/utils/pdbedit.c
===================================================================
--- trunk/source/utils/pdbedit.c        2005-12-28 22:49:02 UTC (rev 12556)
+++ trunk/source/utils/pdbedit.c        2005-12-28 22:48:57 UTC (rev 12557)
@@ -775,6 +775,8 @@
                POPT_TABLEEND
        };
        
+       load_case_tables();
+
        setup_logging("pdbedit", True);
        
        pc = poptGetContext(NULL, argc, (const char **) argv, long_options,

Modified: trunk/source/utils/smbcacls.c
===================================================================
--- trunk/source/utils/smbcacls.c       2005-12-28 22:49:02 UTC (rev 12556)
+++ trunk/source/utils/smbcacls.c       2005-12-28 22:48:57 UTC (rev 12557)
@@ -818,6 +818,8 @@
 
        struct cli_state *cli;
 
+       load_case_tables();
+
        ctx=talloc_init("main");
 
        /* set default debug level to 1 regardless of what smb.conf sets */

Modified: trunk/source/utils/smbcquotas.c
===================================================================
--- trunk/source/utils/smbcquotas.c     2005-12-28 22:49:02 UTC (rev 12556)
+++ trunk/source/utils/smbcquotas.c     2005-12-28 22:48:57 UTC (rev 12557)
@@ -421,6 +421,8 @@
                { NULL }
        };
 
+       load_case_tables();
+
        ZERO_STRUCT(qt);
 
        /* set default debug level to 1 regardless of what smb.conf sets */

Modified: trunk/source/utils/smbget.c
===================================================================
--- trunk/source/utils/smbget.c 2005-12-28 22:49:02 UTC (rev 12556)
+++ trunk/source/utils/smbget.c 2005-12-28 22:48:57 UTC (rev 12557)
@@ -544,6 +544,8 @@
        };
        poptContext pc;
 
+       load_case_tables();
+
        /* only read rcfile if it exists */
        asprintf(&rcfile, "%s/.smbgetrc", getenv("HOME"));
        if(access(rcfile, F_OK) == 0) 

Modified: trunk/source/utils/smbtree.c
===================================================================
--- trunk/source/utils/smbtree.c        2005-12-28 22:49:02 UTC (rev 12556)
+++ trunk/source/utils/smbtree.c        2005-12-28 22:48:57 UTC (rev 12557)
@@ -203,6 +203,7 @@
        poptContext pc;
        
        /* Initialise samba stuff */
+       load_case_tables();
 
        setlinebuf(stdout);
 

Modified: trunk/source/utils/status.c
===================================================================
--- trunk/source/utils/status.c 2005-12-28 22:49:02 UTC (rev 12556)
+++ trunk/source/utils/status.c 2005-12-28 22:48:57 UTC (rev 12557)
@@ -613,6 +613,8 @@
                POPT_TABLEEND
        };
 
+       load_case_tables();
+
        setup_logging(argv[0],True);
        
        dbf = x_stderr;

Modified: trunk/source/utils/testparm.c
===================================================================
--- trunk/source/utils/testparm.c       2005-12-28 22:49:02 UTC (rev 12556)
+++ trunk/source/utils/testparm.c       2005-12-28 22:48:57 UTC (rev 12557)
@@ -230,6 +230,8 @@
                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]");

Reply via email to