diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-07-10 01:10:09 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:19:29 -0500 |
| commit | 76ecf81428c161a98a5621b55a64cb8515f80585 (patch) | |
| tree | 542798f01d1582b00d7d20a93effba33f98ee1fc /source4/torture | |
| parent | c6881d1e650fd284a366af76f5a214a5de05cc0c (diff) | |
| download | samba-76ecf81428c161a98a5621b55a64cb8515f80585.tar.gz samba-76ecf81428c161a98a5621b55a64cb8515f80585.tar.bz2 samba-76ecf81428c161a98a5621b55a64cb8515f80585.zip | |
r8273: fixed some memory leaks in smbscript. This required converting
file_load() to use talloc, which impacted quite a few bits of code,
including our smb.conf processing.
took the opportunity to remove the gloabls in params.c while doing this
(This used to be commit b220756cb4f1d201ba3e771ca67e4bfae5eae748)
Diffstat (limited to 'source4/torture')
| -rw-r--r-- | source4/torture/gentest.c | 4 | ||||
| -rw-r--r-- | source4/torture/torture.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source4/torture/gentest.c b/source4/torture/gentest.c index d6f5046820..6adcbbc0fe 100644 --- a/source4/torture/gentest.c +++ b/source4/torture/gentest.c @@ -2037,7 +2037,7 @@ static BOOL start_gentest(void) /* generate the seeds - after this everything is deterministic */ if (options.use_preset_seeds) { int numops; - char **preset = file_lines_load(options.seeds_file, &numops); + char **preset = file_lines_load(options.seeds_file, &numops, NULL); if (!preset) { printf("Failed to load %s - %s\n", options.seeds_file, strerror(errno)); exit(1); @@ -2186,7 +2186,7 @@ static void usage(void) options.analyze_continuous = True; break; case 'i': - options.ignore_patterns = file_lines_load(optarg, NULL); + options.ignore_patterns = file_lines_load(optarg, NULL, NULL); break; case 'h': usage(); diff --git a/source4/torture/torture.c b/source4/torture/torture.c index 6b993aa7ab..87aba2060a 100644 --- a/source4/torture/torture.c +++ b/source4/torture/torture.c @@ -2068,7 +2068,7 @@ double torture_create_procs(BOOL (*fn)(struct smbcli_state *, int), BOOL *result p = lp_parm_string(-1, "torture", "unclist"); if (p) { - unc_list = file_lines_load(p, &num_unc_names); + unc_list = file_lines_load(p, &num_unc_names, NULL); if (!unc_list || num_unc_names <= 0) { printf("Failed to load unc names list from '%s'\n", p); exit(1); |