r26339: Make loadparm talloc-allocated.

(This used to be commit 1e02cd8db1d65ff72b747833904a10b47749b1fb)

diff --git a/source4/client/smbmount.c b/source4/client/smbmount.c
index 36271c9a2e5d0df76b1f401980c5c6ccd087f7c5..b32bcf5b68d609cde136130ba428cb2d393aa5e2 100644 (file)
--- a/source4/client/smbmount.c
+++ b/source4/client/smbmount.c
@@ -897,7 +897,7 @@ static void parse_mount_smb(int argc, char **argv)
                pstrcpy(username,getenv("LOGNAME"));
        }
 
-       if (!lp_load(dyn_CONFIGFILE, &lp_ctx)) {
+       if (!lp_load(talloc_autofree_context(), dyn_CONFIGFILE, &lp_ctx)) {
                fprintf(stderr, "Can't load %s - run testparm to debug it\n", 
                        lp_config_file());
        }

diff --git a/source4/client/smbspool.c b/source4/client/smbspool.c
index 6a7454b6b2dc78b27b06d669586d07747191574b..0951fb2befec5aa27b54c50c99e0e65782001b69 100644 (file)
--- a/source4/client/smbspool.c
+++ b/source4/client/smbspool.c
@@ -177,7 +177,7 @@ static int          smb_print(struct smbcli_state *, char *, FILE *);
 
   setup_logging(argv[0], DEBUG_STDOUT);
 
-  if (!lp_load(dyn_CONFIGFILE, &lp_ctx)) {
+  if (!lp_load(talloc_autofree_context(), dyn_CONFIGFILE, &lp_ctx)) {
          fprintf(stderr, "ERROR: Can't load %s - run testparm to debug it\n", lp_config_file());
          return (1);
   }

diff --git a/source4/lib/cmdline/popt_common.c b/source4/lib/cmdline/popt_common.c
index b95dfdebc40584e605f203d7f48d51a892918f3c..aae22e00c345616f3e96f85d2b85e78e0342efbe 100644 (file)
--- a/source4/lib/cmdline/popt_common.c
+++ b/source4/lib/cmdline/popt_common.c
@@ -64,9 +64,9 @@ static void popt_samba_callback(poptContext con,
        if (reason == POPT_CALLBACK_REASON_POST) {
                if (!lp_loaded()) {
                        if (getenv("SMB_CONF_PATH"))
-                               lp_load(getenv("SMB_CONF_PATH"), NULL);
+                               lp_load(talloc_autofree_context(), getenv("SMB_CONF_PATH"), NULL);
                        else
-                               lp_load(dyn_CONFIGFILE, NULL);
+                               lp_load(talloc_autofree_context(), dyn_CONFIGFILE, NULL);
                }
                /* Hook any 'every Samba program must do this, after
                 * the smb.conf is setup' functions here */
@@ -120,7 +120,7 @@ static void popt_samba_callback(poptContext con,
 
        case 's':
                if (arg) {
-                       lp_load(arg, NULL);
+                       lp_load(talloc_autofree_context(), arg, NULL);
                }
                break;
 

diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index db2a884400941ede1de0ea375fb0c36965eb420b..8d869e32ff557a97b52f1e344ec44d236a0d6ae9 100644 (file)
--- a/source4/param/loadparm.c
+++ b/source4/param/loadparm.c
@@ -259,7 +259,7 @@ struct loadparm_service sDefault = {
 };
 
 /* local variables */
-static struct loadparm_context {
+struct loadparm_context {
        struct loadparm_global Globals;
        struct loadparm_service **ServicePtrs;
        int iNumServices;
@@ -271,9 +271,9 @@ static struct loadparm_context {
                char *subfname;
                time_t modtime;
        } *file_lists;
-} loadparm;
+};
 
-struct loadparm_context *global_loadparm = &loadparm;
+struct loadparm_context *global_loadparm = NULL;
 
 #define NUMPARAMETERS (sizeof(parm_table) / sizeof(struct parm_struct))
 
@@ -1087,7 +1087,7 @@ struct loadparm_service *lp_add_service(struct loadparm_context *lp_ctx,
                lp_ctx->iNumServices++;
        } 
 
-       lp_ctx->ServicePtrs[i] = init_service(talloc_autofree_context());
+       lp_ctx->ServicePtrs[i] = init_service(lp_ctx);
        if (lp_ctx->ServicePtrs[i] == NULL) {
                DEBUG(0,("lp_add_service: out of memory!\n"));
                return NULL;
@@ -1246,11 +1246,12 @@ void *lp_parm_ptr(struct loadparm_context *lp_ctx,
        if (service == NULL) {
                if (parm->class == P_LOCAL)
                        return ((char *)&sDefault)+parm->offset;
-               else
-                       return ((char *)&lp_ctx->Globals)+parm->offset;
+               else if (parm->class == P_GLOBAL)
+                       return ((char *)&(lp_ctx->Globals))+parm->offset;
+               else return NULL;
+       } else {
+               return ((char *)service) + parm->offset;
        }
-
-       return ((char *)service) + parm->offset;
 }
 
 /***************************************************************************
@@ -1317,7 +1318,7 @@ static void copy_service(struct loadparm_service *pserviceDest,
                                        strupper(*(char **)dest_ptr);
                                        break;
                                case P_LIST:
-                                       *(const char ***)dest_ptr = str_list_copy(talloc_autofree_context(), 
+                                       *(const char ***)dest_ptr = str_list_copy(pserviceDest, 
                                                                                  *(const char ***)src_ptr);
                                        break;
                                default:
@@ -1416,7 +1417,7 @@ static void add_to_file_list(struct loadparm_context *lp_ctx,
        }
 
        if (!f) {
-               f = talloc(talloc_autofree_context(), struct file_lists);
+               f = talloc(lp_ctx, struct file_lists);
                if (!f)
                        return;
                f->next = lp_ctx->file_lists;
@@ -1452,7 +1453,7 @@ bool lp_file_list_changed(struct loadparm_context *lp_ctx)
                char *n2;
                time_t mod_time;
 
-               n2 = standard_sub_basic(talloc_autofree_context(), f->name);
+               n2 = standard_sub_basic(lp_ctx, f->name);
 
                DEBUGADD(6, ("file %s -> %s  last mod_time: %s\n",
                             f->name, n2, ctime(&f->modtime)));
@@ -1478,12 +1479,11 @@ bool lp_file_list_changed(struct loadparm_context *lp_ctx)
 static bool handle_include(struct loadparm_context *lp_ctx, 
                           const char *pszParmValue, char **ptr)
 {
-       char *fname = standard_sub_basic(talloc_autofree_context(), 
-                                        pszParmValue);
+       char *fname = standard_sub_basic(lp_ctx, pszParmValue);
 
        add_to_file_list(lp_ctx, pszParmValue, fname);
 
-       string_set(talloc_autofree_context(), ptr, fname);
+       string_set(lp_ctx, ptr, fname);
 
        if (file_exist(fname))
                return pm_process(fname, do_section, do_parameter, lp_ctx);
@@ -1503,7 +1503,7 @@ static bool handle_copy(struct loadparm_context *lp_ctx,
        bool bRetval;
        struct loadparm_service *serviceTemp;
 
-       string_set(talloc_autofree_context(), ptr, pszParmValue);
+       string_set(lp_ctx, ptr, pszParmValue);
 
        bRetval = false;
 
@@ -1569,7 +1569,7 @@ static bool lp_do_parameter_parametric(struct loadparm_context *lp_ctx,
 
        if (service == NULL) {
                data = lp_ctx->Globals.param_opt;
-               mem_ctx = talloc_autofree_context();
+               mem_ctx = lp_ctx;
        } else {
                data = service->param_opt;
                mem_ctx = service;
@@ -1732,7 +1732,7 @@ bool lp_do_global_parameter(struct loadparm_context *lp_ctx,
 
        parm_ptr = lp_parm_ptr(lp_ctx, NULL, &parm_table[parmnum]);
 
-       return set_variable(talloc_autofree_context(), parmnum, parm_ptr, 
+       return set_variable(lp_ctx, parmnum, parm_ptr, 
                            pszParmName, pszParmValue, lp_ctx);
 }
 
@@ -2240,14 +2240,38 @@ void lp_killunused(struct loadparm_context *lp_ctx,
        }
 }
 
+
+static int lp_destructor(struct loadparm_context *lp_ctx)
+{
+       struct param_opt *data;
+
+       if (lp_ctx->Globals.param_opt != NULL) {
+               struct param_opt *next;
+               for (data = lp_ctx->Globals.param_opt; data; data=next) {
+                       next = data->next;
+                       if (data->flags & FLAG_CMDLINE) continue;
+                       DLIST_REMOVE(lp_ctx->Globals.param_opt, data);
+                       talloc_free(data);
+               }
+       }
+
+       return 0;
+}
+
 /***************************************************************************
  Initialise the global parameter structure.
 ***************************************************************************/
-bool loadparm_init(struct loadparm_context *lp_ctx)
+struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx)
 {
        int i;
        char *myname;
+       struct loadparm_context *lp_ctx;
 
+       lp_ctx = talloc(mem_ctx, struct loadparm_context);
+       if (lp_ctx == NULL)
+               return NULL;
+
+       talloc_set_destructor(lp_ctx, lp_destructor);
        lp_ctx->bInGlobalSection = true;
 
        DEBUG(3, ("Initialising global parameters\n"));
@@ -2257,7 +2281,7 @@ bool loadparm_init(struct loadparm_context *lp_ctx)
                     parm_table[i].type == P_USTRING) &&
                    parm_table[i].offset != -1 &&
                    !(parm_table[i].flags & FLAG_CMDLINE)) {
-                       string_set(talloc_autofree_context(), 
+                       string_set(lp_ctx, 
                                   (char **)(
                                   (char *)((parm_table[i].class == P_LOCAL)?&sDefault:&(lp_ctx->Globals)) +
                                   parm_table[i].offset), "");
@@ -2400,50 +2424,34 @@ bool loadparm_init(struct loadparm_context *lp_ctx)
                }
        }
 
-       return true;
-}
-
-_PUBLIC_ _DEPRECATED_ bool lp_load_default(void)
-{
-       return lp_load(dyn_CONFIGFILE, NULL);
+       return lp_ctx;
 }
 
 /***************************************************************************
  Load the services array from the services file. Return True on success, 
  False on failure.
 ***************************************************************************/
-
-bool lp_load(const char *filename, struct loadparm_context **ret_lp)
+bool lp_load(TALLOC_CTX *mem_ctx, const char *filename, struct loadparm_context **ret_lp)
 {
        char *n2;
        bool bRetval;
-       struct param_opt *data;
-       struct loadparm_context *lp_ctx = &loadparm;
+       struct loadparm_context *lp_ctx;
 
        if (ret_lp != NULL)
                *ret_lp = NULL;
 
-       filename = talloc_strdup(talloc_autofree_context(), filename);
+       lp_ctx = loadparm_init(mem_ctx);
+       if (lp_ctx == NULL)
+               return false;
 
        global_loadparm = lp_ctx;
 
-       if (lp_ctx->Globals.param_opt != NULL) {
-               struct param_opt *next;
-               for (data = lp_ctx->Globals.param_opt; data; data=next) {
-                       next = data->next;
-                       if (data->flags & FLAG_CMDLINE) continue;
-                       DLIST_REMOVE(lp_ctx->Globals.param_opt, data);
-                       talloc_free(data);
-               }
-       }
-
-       if (!loadparm_init(lp_ctx))
-               return false;
+       filename = talloc_strdup(lp_ctx, filename);
 
        lp_ctx->Globals.szConfigFile = filename;
        
        lp_ctx->bInGlobalSection = true;
-       n2 = standard_sub_basic(talloc_autofree_context(), lp_ctx->Globals.szConfigFile);
+       n2 = standard_sub_basic(lp_ctx, lp_ctx->Globals.szConfigFile);
        DEBUG(2, ("lp_load: refreshing parameters from %s\n", n2));
        
        add_to_file_list(lp_ctx, lp_ctx->Globals.szConfigFile, n2);

diff --git a/source4/scripting/ejs/smbcalls_config.c b/source4/scripting/ejs/smbcalls_config.c
index 347cb758fe760e1ac04bbc8123d35bc7a0c297e3..157587186cd1274d040005111501d9c5d2d9143e 100644 (file)
--- a/source4/scripting/ejs/smbcalls_config.c
+++ b/source4/scripting/ejs/smbcalls_config.c
@@ -189,7 +189,7 @@ static int ejs_lpReload(MprVarHandle eid, int argc, char **argv)
 {
        bool ret;
        
-       ret = lp_load(lp_configfile(global_loadparm), NULL);
+       ret = lp_load(talloc_autofree_context(), lp_configfile(global_loadparm), NULL);
        if (ret) {
                unload_interfaces();
        }

diff --git a/source4/scripting/ejs/smbscript.c b/source4/scripting/ejs/smbscript.c
index 2bb67135eac5804535487547874bcdcfcfe1aa02..e00d52589adbedd782659e587cf1dd2929772008 100644 (file)
--- a/source4/scripting/ejs/smbscript.c
+++ b/source4/scripting/ejs/smbscript.c
@@ -54,9 +54,9 @@ int main(int argc, const char **argv)
        fault_setup(argv[0]);
 
        if (getenv("SMB_CONF_PATH")) {
-               lp_load(getenv("SMB_CONF_PATH"), &lp_ctx);
+               lp_load(talloc_autofree_context(), getenv("SMB_CONF_PATH"), &lp_ctx);
        } else {
-               lp_load(dyn_CONFIGFILE, &lp_ctx);
+               lp_load(talloc_autofree_context(), dyn_CONFIGFILE, &lp_ctx);
        }
 
        ldb_global_init();

diff --git a/source4/torture/gentest.c b/source4/torture/gentest.c
index edc1b0754aeec72e4d322f0ca6cbc98a0f24b744..c1e33820af0bf4c51fd78adb37d7f14104df3dd5 100644 (file)
--- a/source4/torture/gentest.c
+++ b/source4/torture/gentest.c
@@ -2197,7 +2197,7 @@ static bool split_unc_name(const char *unc, char **server, char **share)
        argc -= NSERVERS;
        argv += NSERVERS;
 
-       lp_load(dyn_CONFIGFILE, &lp_ctx);
+       lp_load(talloc_autofree_context(), dyn_CONFIGFILE, &lp_ctx);
 
        servers[0].credentials = cli_credentials_init(talloc_autofree_context());
        servers[1].credentials = cli_credentials_init(talloc_autofree_context());

diff --git a/source4/torture/locktest.c b/source4/torture/locktest.c
index 08050fc40a069bab9666ae83f852e7fa1d83ce73..a53422fb44bc2016c47b9b69680c13d61931795d 100644 (file)
--- a/source4/torture/locktest.c
+++ b/source4/torture/locktest.c
@@ -565,7 +565,7 @@ static void usage(void)
        argc -= NSERVERS;
        argv += NSERVERS;
 
-       lp_load(dyn_CONFIGFILE, &lp_ctx);
+       lp_load(talloc_autofree_context(), dyn_CONFIGFILE, &lp_ctx);
 
        servers[0] = cli_credentials_init(talloc_autofree_context());
        servers[1] = cli_credentials_init(talloc_autofree_context());

diff --git a/source4/torture/locktest2.c b/source4/torture/locktest2.c
index 1798e485ea2b8bcc2961970c6d3d08dad8f74c31..e8b0170f91f27566ddd741dc90c111b3f3468543 100644 (file)
--- a/source4/torture/locktest2.c
+++ b/source4/torture/locktest2.c
@@ -484,7 +484,7 @@ static void usage(void)
        argc -= 4;
        argv += 4;
 
-       lp_load(dyn_CONFIGFILE, &lp_ctx);
+       lp_load(talloc_autofree_context(), dyn_CONFIGFILE, &lp_ctx);
 
        if (getenv("USER")) {
                fstrcpy(username,getenv("USER"));

diff --git a/source4/torture/masktest.c b/source4/torture/masktest.c
index c2e3d7b1ddea2527ef078cbda8779eda082dc292..402ea4ae9c0522ab8bc7dbc651b9ee8699939843 100644 (file)
--- a/source4/torture/masktest.c
+++ b/source4/torture/masktest.c
@@ -303,7 +303,7 @@ static void usage(void)
        argc -= 1;
        argv += 1;
 
-       lp_load(dyn_CONFIGFILE, &lp_ctx);
+       lp_load(talloc_autofree_context(), dyn_CONFIGFILE, &lp_ctx);
 
        credentials = cli_credentials_init(talloc_autofree_context());
        cli_credentials_guess(credentials, lp_ctx);

diff --git a/source4/utils/testparm.c b/source4/utils/testparm.c
index b9e6bc059551b8a0209358a68a7fbc0f7e7999d2..381d2b3b598c5f8ba995adcf19e1789bb09e5b17 100644 (file)
--- a/source4/utils/testparm.c
+++ b/source4/utils/testparm.c
@@ -239,7 +239,7 @@ static int do_share_checks(struct loadparm_context *lp_ctx, const char *cname, c
 
        fprintf(stderr, "Loaded smb config files from %s\n", lp_configfile(global_loadparm));
 
-       if (!lp_load(lp_configfile(global_loadparm), &lp_ctx)) {
+       if (!lp_load(talloc_autofree_context(), lp_configfile(global_loadparm), &lp_ctx)) {
                fprintf(stderr,"Error loading services.\n");
                return(1);
        }