sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-11-15 16:23:49 +03:00
Code Activity

r13827: Minor enhancements or cosmetic changes

Browse Source
This commit is contained in:
Simo Sorce
2006-03-03 22:52:57 +00:00
committed by Gerald (Jerry) Carter
parent 76cbab0e25
commit 7ef63abae1
5 changed files with 34 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/lib/ldb/ldb_ldap/ldb_ldap.c
View File

@@ -395,12 +395,15 @@ static int lldb_search_bytree(struct ldb_module *module, const struct ldb_dn *ba
ret = lldb_search_async(module, base, scope, tree, attrs, control_req,
res, &lldb_search_sync_callback, lldb->timeout, &handle);
if (ret != LDB_SUCCESS)
return ret;
if (ret == LDB_SUCCESS) {
ret = ldb_async_wait(module->ldb, handle, LDB_WAIT_ALL);
talloc_free(handle);
}
ret = ldb_async_wait(module->ldb, handle, LDB_WAIT_ALL);
if (ret != LDB_SUCCESS) {
talloc_free(*res);
}
talloc_free(handle);
return ret;
}
@@ -866,7 +869,7 @@ static int lldb_async_wait(struct ldb_module *module, struct ldb_async_handle *h
struct lldb_private *lldb = talloc_get_type(ac->module->private_data, struct lldb_private);
struct timeval timeout;
LDAPMessage *result;
int ret;
int ret = LDB_ERR_OPERATIONS_ERROR;
if (!ac->msgid) {
return LDB_ERR_OPERATIONS_ERROR;
@@ -915,8 +918,6 @@ static int lldb_async_wait(struct ldb_module *module, struct ldb_async_handle *h
}
}
break;
default:
ret = LDB_ERR_OPERATIONS_ERROR;
}
return ret;