sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

Revert "s3:idmap_autorid: add a talloc_stackframe() to idmap_autorid_initialize()"

Browse Source 
This reverts commit 65490ea4e6.

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
This commit is contained in:
Michael Adam 2011-06-10 00:36:38 +02:00
parent 56e94c203f
commit 8963e807e3
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source3/winbindd/idmap_autorid.c
View File

@ -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;
}