summaryrefslogtreecommitdiffstats
path: root/source/utils
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-07-10 01:10:09 +0000
committerAndrew Tridgell <tridge@samba.org>2005-07-10 01:10:09 +0000
commita4b45bebff2376af9c2e09c0c302975e8d95bf03 (patch)
tree126a78bc95a8207755bd0ba07a55f9fe225277c9 /source/utils
parent5b6960f79484d071f7723f4ca1d93b6db1713641 (diff)
downloadsamba-a4b45bebff2376af9c2e09c0c302975e8d95bf03.tar.gz
samba-a4b45bebff2376af9c2e09c0c302975e8d95bf03.tar.xz
samba-a4b45bebff2376af9c2e09c0c302975e8d95bf03.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
Diffstat (limited to 'source/utils')
-rw-r--r--source/utils/ndrdump.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/utils/ndrdump.c b/source/utils/ndrdump.c
index 58cdeb13c3a..0cc96bfe122 100644
--- a/source/utils/ndrdump.c
+++ b/source/utils/ndrdump.c
@@ -188,7 +188,7 @@ static char *stdin_load(TALLOC_CTX *mem_ctx, size_t *size)
exit(1);
}
- data = (uint8_t *)file_load(ctx_filename, &size);
+ data = (uint8_t *)file_load(ctx_filename, &size, mem_ctx);
if (!data) {
perror(ctx_filename);
exit(1);
@@ -213,7 +213,7 @@ static char *stdin_load(TALLOC_CTX *mem_ctx, size_t *size)
}
if (filename)
- data = (uint8_t *)file_load(filename, &size);
+ data = (uint8_t *)file_load(filename, &size, mem_ctx);
else
data = (uint8_t *)stdin_load(mem_ctx, &size);