diff options
author | Simo Sorce <idra@samba.org> | 2008-12-22 15:54:56 -0500 |
---|---|---|
committer | Simo Sorce <idra@samba.org> | 2008-12-22 18:52:48 -0500 |
commit | 41718e315ea78998fab0893fd5f148a49d8faab8 (patch) | |
tree | ecbc13fb3abce56481ba04e13d9aa1b69b19783b /ldb/common/ldb.c | |
parent | a93a69380dc6718c49879af628ed69f8e2b70797 (diff) | |
download | sssd-41718e315ea78998fab0893fd5f148a49d8faab8.tar.gz sssd-41718e315ea78998fab0893fd5f148a49d8faab8.tar.xz sssd-41718e315ea78998fab0893fd5f148a49d8faab8.zip |
Rebase ldb code with all changes in samba master
Diffstat (limited to 'ldb/common/ldb.c')
-rw-r--r-- | ldb/common/ldb.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/ldb/common/ldb.c b/ldb/common/ldb.c index bb7103345..c013565da 100644 --- a/ldb/common/ldb.c +++ b/ldb/common/ldb.c @@ -394,7 +394,6 @@ static int ldb_autotransaction_request(struct ldb_context *ldb, int ldb_wait(struct ldb_handle *handle, enum ldb_wait_type type) { struct event_context *ev; - int ret; if (!handle) { return LDB_ERR_UNAVAILABLE; @@ -411,8 +410,7 @@ int ldb_wait(struct ldb_handle *handle, enum ldb_wait_type type) switch (type) { case LDB_WAIT_NONE: - ret = event_loop_once(ev); - if (ret) return LDB_ERR_OPERATIONS_ERROR; + event_loop_once(ev); if (handle->state == LDB_ASYNC_DONE || handle->status != LDB_SUCCESS) { return handle->status; @@ -421,8 +419,7 @@ int ldb_wait(struct ldb_handle *handle, enum ldb_wait_type type) case LDB_WAIT_ALL: while (handle->state != LDB_ASYNC_DONE) { - ret = event_loop_once(ev); - if (ret) return LDB_ERR_OPERATIONS_ERROR; + event_loop_once(ev); if (handle->status != LDB_SUCCESS) { return handle->status; } |