[SCM] Samba Shared Repository - branch v3-6-test updated
Volker Lendecke
vlendec at samba.org
Sun Mar 13 06:39:06 MDT 2011
The branch, v3-6-test has been updated
via 557ac22 s3: Enhance error messages in idmap_tdb2_init_hwm
from 7a7d49a Revert "s3: Fix bug 8009"
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit 557ac220f8f99729ffc7beb5e63107feb3d64178
Author: Volker Lendecke <vl at samba.org>
Date: Sun Mar 13 10:41:27 2011 +0100
s3: Enhance error messages in idmap_tdb2_init_hwm
Autobuild-User: Volker Lendecke <vlendec at samba.org>
Autobuild-Date: Sun Mar 13 12:59:37 CET 2011 on sn-devel-104
(cherry picked from commit 51ebaac75b8d068766872b156c3a4507ddc0705a)
-----------------------------------------------------------------------
Summary of changes:
source3/winbindd/idmap_tdb2.c | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/winbindd/idmap_tdb2.c b/source3/winbindd/idmap_tdb2.c
index a78a41e..43b75fa 100644
--- a/source3/winbindd/idmap_tdb2.c
+++ b/source3/winbindd/idmap_tdb2.c
@@ -57,6 +57,7 @@ struct idmap_tdb2_context {
*/
static NTSTATUS idmap_tdb2_init_hwm(struct idmap_domain *dom)
{
+ NTSTATUS status;
uint32 low_id;
struct idmap_tdb2_context *ctx;
@@ -66,22 +67,22 @@ static NTSTATUS idmap_tdb2_init_hwm(struct idmap_domain *dom)
low_id = dbwrap_fetch_int32(ctx->db, HWM_USER);
if ((low_id == -1) || (low_id < dom->low_id)) {
- if (!NT_STATUS_IS_OK(dbwrap_trans_store_int32(
- ctx->db, HWM_USER,
- dom->low_id))) {
+ status = dbwrap_trans_store_int32(ctx->db, HWM_USER,
+ dom->low_id);
+ if (!NT_STATUS_IS_OK(status)) {
DEBUG(0, ("Unable to initialise user hwm in idmap "
- "database\n"));
+ "database: %s\n", nt_errstr(status)));
return NT_STATUS_INTERNAL_DB_ERROR;
}
}
low_id = dbwrap_fetch_int32(ctx->db, HWM_GROUP);
if ((low_id == -1) || (low_id < dom->low_id)) {
- if (!NT_STATUS_IS_OK(dbwrap_trans_store_int32(
- ctx->db, HWM_GROUP,
- dom->low_id))) {
+ status = dbwrap_trans_store_int32(ctx->db, HWM_GROUP,
+ dom->low_id);
+ if (!NT_STATUS_IS_OK(status)) {
DEBUG(0, ("Unable to initialise group hwm in idmap "
- "database\n"));
+ "database: %s\n", nt_errstr(status)));
return NT_STATUS_INTERNAL_DB_ERROR;
}
}
--
Samba Shared Repository
More information about the samba-cvs
mailing list