diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-21 01:07:06 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-21 01:07:06 +0100 |
| commit | 40992617d12b3a3ae47139304a3ee9c8e79e8e86 (patch) | |
| tree | 86a429b68f454e9dd06040e1d71f430e9376d829 /source4/lib | |
| parent | c9290a86dd0bddba23ec43527ab52503b962963d (diff) | |
| parent | 0b1a24681e6b41129e05a9612610fade27aecd4d (diff) | |
| download | samba-40992617d12b3a3ae47139304a3ee9c8e79e8e86.tar.gz samba-40992617d12b3a3ae47139304a3ee9c8e79e8e86.tar.bz2 samba-40992617d12b3a3ae47139304a3ee9c8e79e8e86.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
(This used to be commit 1bb673ce4e84088bc77d490101e8904cf9a467a2)
Diffstat (limited to 'source4/lib')
| -rw-r--r-- | source4/lib/ldb/common/ldb.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/source4/lib/ldb/common/ldb.c b/source4/lib/ldb/common/ldb.c index 5f2e5e3ffc..3c9ef3ff69 100644 --- a/source4/lib/ldb/common/ldb.c +++ b/source4/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 */ |