summaryrefslogtreecommitdiff
path: root/source4/ldap_server
diff options
context:
space:
mode:
authorSimo Sorce <idra@samba.org>2006-07-22 16:56:33 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:10:16 -0500
commitc93817b36d3ff7f44cb7b3e1d1a29e37ec12affe (patch)
tree70d3018287cbbe9ceee3cae3ab66ce33f32559aa /source4/ldap_server
parent550f5fb26e67f46eead182476f7a9bcfd1ac5dc0 (diff)
downloadsamba-c93817b36d3ff7f44cb7b3e1d1a29e37ec12affe.tar.gz
samba-c93817b36d3ff7f44cb7b3e1d1a29e37ec12affe.tar.bz2
samba-c93817b36d3ff7f44cb7b3e1d1a29e37ec12affe.zip
r17185: Oh, I wanted to do this for sooo long time.
Finally acknowledge that ldb is inherently async and does not have a dual personality anymore Rename all ldb_async_XXX functions to ldb_XXX except for ldb_async_result, it is now ldb_reply to reflect the real function of this structure. Simo. (This used to be commit 25fc7354049d62efeba17681ef1cdd326bc3f2ef)
Diffstat (limited to 'source4/ldap_server')
-rw-r--r--source4/ldap_server/ldap_backend.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/ldap_server/ldap_backend.c b/source4/ldap_server/ldap_backend.c
index fcd282da9e..3f9aaf6af8 100644
--- a/source4/ldap_server/ldap_backend.c
+++ b/source4/ldap_server/ldap_backend.c
@@ -113,7 +113,7 @@ NTSTATUS ldapsrv_unwilling(struct ldapsrv_call *call, int error)
return NT_STATUS_OK;
}
-static int ldapsrv_SearchCallback(struct ldb_context *ldb, void *context, struct ldb_async_result *ares)
+static int ldapsrv_SearchCallback(struct ldb_context *ldb, void *context, struct ldb_reply *ares)
{
struct ldb_result *res;
int n;
@@ -262,7 +262,7 @@ static NTSTATUS ldapsrv_SearchRequest(struct ldapsrv_call *call)
goto reply;
}
- ldb_ret = ldb_async_wait(lreq->async.handle, LDB_WAIT_ALL);
+ ldb_ret = ldb_wait(lreq->async.handle, LDB_WAIT_ALL);
if (ldb_ret == LDB_SUCCESS) {
for (i = 0; i < res->count; i++) {