diff options
| author | Michael Adam <obnox@samba.org> | 2011-06-10 00:36:38 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2011-06-11 12:55:11 +0200 |
| commit | 8963e807e39097278f4f6134a72e016ca7d21279 (patch) | |
| tree | b531d5f52e5e52d70c98638b325fd8217bbeb0ce | |
| parent | 56e94c203f39eaae35ba82527bf928f876b13ab8 (diff) | |
| download | samba-8963e807e39097278f4f6134a72e016ca7d21279.tar.gz samba-8963e807e39097278f4f6134a72e016ca7d21279.tar.bz2 samba-8963e807e39097278f4f6134a72e016ca7d21279.zip | |
Revert "s3:idmap_autorid: add a talloc_stackframe() to idmap_autorid_initialize()"
This reverts commit 65490ea4e67bf82cf8fb0b8e4e74047c3f63c509.
This sequence of patches needs to be done differently.
Autobuild-User: Michael Adam <obnox@samba.org>
Autobuild-Date: Sat Jun 11 12:55:11 CEST 2011 on sn-devel-104
| -rw-r--r-- | source3/winbindd/idmap_autorid.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/source3/winbindd/idmap_autorid.c b/source3/winbindd/idmap_autorid.c index 4e0fdff33a..e9048d8484 100644 --- a/source3/winbindd/idmap_autorid.c +++ b/source3/winbindd/idmap_autorid.c @@ -435,13 +435,11 @@ static NTSTATUS idmap_autorid_initialize(struct idmap_domain *dom) struct autorid_global_config *storedconfig = NULL; NTSTATUS status; uint32_t hwm; - TALLOC_CTX *frame = talloc_stackframe(); - config = talloc_zero(frame, struct autorid_global_config); + config = talloc_zero(dom, struct autorid_global_config); if (!config) { DEBUG(0, ("Out of memory!\n")); - status = NT_STATUS_NO_MEMORY; - goto error; + return NT_STATUS_NO_MEMORY; } status = idmap_autorid_db_init(); @@ -482,7 +480,7 @@ static NTSTATUS idmap_autorid_initialize(struct idmap_domain *dom) config->minvalue, config->rangesize, config->maxranges)); /* read previously stored config and current HWM */ - storedconfig = idmap_autorid_loadconfig(frame); + storedconfig = idmap_autorid_loadconfig(talloc_tos()); if (!dbwrap_fetch_uint32(autorid_db, HWM, &hwm)) { DEBUG(1, ("Fatal error while fetching current " @@ -532,7 +530,8 @@ static NTSTATUS idmap_autorid_initialize(struct idmap_domain *dom) return NT_STATUS_OK; error: - talloc_free(frame); + talloc_free(config); + talloc_free(storedconfig); return status; } |