From b4e528ab54bbca8968cf8f601dd65e3b80cad9a2 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Thu, 6 Oct 2011 19:17:25 +0200 Subject: s3:idmap_autorid: untangle function from check and log status in idmap_autorid_db_init() --- source3/winbindd/idmap_autorid.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'source3/winbindd/idmap_autorid.c') diff --git a/source3/winbindd/idmap_autorid.c b/source3/winbindd/idmap_autorid.c index 780f533c56..d3e676b42f 100644 --- a/source3/winbindd/idmap_autorid.c +++ b/source3/winbindd/idmap_autorid.c @@ -336,6 +336,7 @@ static NTSTATUS idmap_autorid_sids_to_unixids(struct idmap_domain *dom, static NTSTATUS idmap_autorid_db_init(void) { int32_t hwm; + NTSTATUS status; if (autorid_db) { /* its already open */ @@ -355,11 +356,11 @@ static NTSTATUS idmap_autorid_db_init(void) /* Initialize high water mark for the currently used range to 0 */ hwm = dbwrap_fetch_int32(autorid_db, HWM); if ((hwm < 0)) { - if (!NT_STATUS_IS_OK - (dbwrap_trans_store_int32(autorid_db, HWM, 0))) { + status = dbwrap_trans_store_int32(autorid_db, HWM, 0); + if (!NT_STATUS_IS_OK(status)) { DEBUG(0, ("Unable to initialise HWM in autorid " - "database\n")); + "database: %s\n", nt_errstr(status))); return NT_STATUS_INTERNAL_DB_ERROR; } } @@ -367,11 +368,11 @@ static NTSTATUS idmap_autorid_db_init(void) /* Initialize high water mark for alloc pool to 0 */ hwm = dbwrap_fetch_int32(autorid_db, ALLOC_HWM); if ((hwm < 0)) { - if (!NT_STATUS_IS_OK - (dbwrap_trans_store_int32(autorid_db, ALLOC_HWM, 0))) { + status = dbwrap_trans_store_int32(autorid_db, ALLOC_HWM, 0); + if (!NT_STATUS_IS_OK(status)) { DEBUG(0, ("Unable to initialise HWM in autorid " - "database\n")); + "database: %s\n", nt_errstr(status))); return NT_STATUS_INTERNAL_DB_ERROR; } } -- cgit