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/utils/ndrdump.c | |
| 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/utils/ndrdump.c')
| -rw-r--r-- | source4/utils/ndrdump.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/utils/ndrdump.c b/source4/utils/ndrdump.c index 58cdeb13c3..0cc96bfe12 100644 --- a/source4/utils/ndrdump.c +++ b/source4/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); |