From e9796edaa8c67c88b30b4e5e937fd7279674403b Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Fri, 21 Mar 2014 00:07:07 +0100 Subject: [PATCH] autorid: initialize: use the split db_open and init_hwms function instead of db_init This way, we can later put all of the storing functions inside one transaction. Signed-off-by: Michael Adam Reviewed-by: Jeremy Allison --- source3/winbindd/idmap_autorid.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/source3/winbindd/idmap_autorid.c b/source3/winbindd/idmap_autorid.c index fcfdb2bb1e8..ec12278388d 100644 --- a/source3/winbindd/idmap_autorid.c +++ b/source3/winbindd/idmap_autorid.c @@ -650,7 +650,7 @@ static NTSTATUS idmap_autorid_initialize(struct idmap_domain *dom) commonconfig->rw_ops->get_new_id = idmap_autorid_allocate_id; commonconfig->rw_ops->set_mapping = idmap_tdb_common_set_mapping; - status = idmap_autorid_db_init(state_path("autorid.tdb"), + status = idmap_autorid_db_open(state_path("autorid.tdb"), NULL, /* TALLOC_CTX */ &autorid_db); if (!NT_STATUS_IS_OK(status)) { @@ -659,6 +659,11 @@ static NTSTATUS idmap_autorid_initialize(struct idmap_domain *dom) commonconfig->db = autorid_db; + status = idmap_autorid_init_hwms(autorid_db); + if (!NT_STATUS_IS_OK(status)) { + goto error; + } + status = idmap_autorid_saveconfig(autorid_db, config); if (!NT_STATUS_IS_OK(status)) { DEBUG(1, ("Failed to store configuration data!\n")); -- 2.11.4.GIT