The branch, v4-0-test has been updated via 5cd3310b78a85243eb436d05db3228c3495f9162 (commit) via c4d502f68fbd5d5bc2ac5bb6369950379c9176fc (commit) from 53c70b5f77a3b9abaab783590e66278129173d5f (commit)
http://gitweb.samba.org/?samba.git;a=shortlog;h=v4-0-test - Log ----------------------------------------------------------------- commit 5cd3310b78a85243eb436d05db3228c3495f9162 Merge: c4d502f68fbd5d5bc2ac5bb6369950379c9176fc 53c70b5f77a3b9abaab783590e66278129173d5f Author: Andrew Bartlett <[EMAIL PROTECTED]> Date: Thu Feb 21 09:55:13 2008 +1100 Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local commit c4d502f68fbd5d5bc2ac5bb6369950379c9176fc Author: Andrew Bartlett <[EMAIL PROTECTED]> Date: Thu Feb 21 09:53:11 2008 +1100 Until the new ldb changes land, make ldb_wait set the error string. This makes it easier to track down which module only returned and error code, but not the error string. Andrew Bartlett ----------------------------------------------------------------------- Summary of changes: source/lib/ldb/common/ldb.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source/lib/ldb/common/ldb.c b/source/lib/ldb/common/ldb.c index 5f2e5e3..3c9ef3f 100644 --- a/source/lib/ldb/common/ldb.c +++ b/source/lib/ldb/common/ldb.c @@ -508,11 +508,17 @@ static int ldb_autotransaction_request(struct ldb_context *ldb, struct ldb_reque int ldb_wait(struct ldb_handle *handle, enum ldb_wait_type type) { + int ret; if (!handle) { return LDB_SUCCESS; } - return handle->module->ops->wait(handle, type); + ret = handle->module->ops->wait(handle, type); + if (!ldb_errstring(handle->module->ldb)) { + /* Set a default error string, to place the blame somewhere */ + ldb_asprintf_errstring(handle->module->ldb, "error waiting on module %s: %s (%d)", handle->module->ops->name, ldb_strerror(ret), ret); + } + return ret; } /* set the specified timeout or, if timeout is 0 set the default timeout */ -- Samba Shared Repository