summaryrefslogtreecommitdiff
path: root/source4/torture/ldap
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/torture/ldap
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/torture/ldap')
-rw-r--r--source4/torture/ldap/schema.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/source4/torture/ldap/schema.c b/source4/torture/ldap/schema.c
index 8144782e60..80fe3eab1c 100644
--- a/source4/torture/ldap/schema.c
+++ b/source4/torture/ldap/schema.c
@@ -102,7 +102,7 @@ struct test_rootDSE {
const char *schemadn;
};
-struct test_schema_async_ctx {
+struct test_schema_ctx {
struct ldb_paged_control *ctrl;
uint32_t count;
BOOL pending;
@@ -143,9 +143,9 @@ static BOOL test_search_rootDSE(struct ldb_context *ldb, struct test_rootDSE *ro
return True;
}
-static int test_schema_search_callback(struct ldb_context *ldb, void *context, struct ldb_async_result *ares)
+static int test_schema_search_callback(struct ldb_context *ldb, void *context, struct ldb_reply *ares)
{
- struct test_schema_async_ctx *actx = talloc_get_type(context, struct test_schema_async_ctx);
+ struct test_schema_ctx *actx = talloc_get_type(context, struct test_schema_ctx);
int ret = LDB_SUCCESS;
switch (ares->type) {
@@ -208,10 +208,10 @@ static BOOL test_create_schema_type(struct ldb_context *ldb, struct test_rootDSE
struct ldb_paged_control *control;
struct ldb_request *req;
int ret;
- struct test_schema_async_ctx *actx;
+ struct test_schema_ctx *actx;
req = talloc(ldb, struct ldb_request);
- actx = talloc(req, struct test_schema_async_ctx);
+ actx = talloc(req, struct test_schema_ctx);
ctrl = talloc_array(req, struct ldb_control *, 2);
ctrl[0] = talloc(ctrl, struct ldb_control);
@@ -248,7 +248,7 @@ again:
return False;
}
- ret = ldb_async_wait(req->async.handle, LDB_WAIT_ALL);
+ ret = ldb_wait(req->async.handle, LDB_WAIT_ALL);
if (ret != LDB_SUCCESS) {
d_printf("search error - %s\n", ldb_errstring(ldb));
return False;