diff options
Diffstat (limited to 'source4/lib/ldb/modules/operational.c')
| -rw-r--r-- | source4/lib/ldb/modules/operational.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/source4/lib/ldb/modules/operational.c b/source4/lib/ldb/modules/operational.c index 4cadaa27ee..7e7c8d83ad 100644 --- a/source4/lib/ldb/modules/operational.c +++ b/source4/lib/ldb/modules/operational.c @@ -226,7 +226,7 @@ static int add_uint64_element(struct ldb_message *msg, const char *attr, uint64_ hook search operations */ -struct operational_async_context { +struct operational_context { struct ldb_module *module; void *up_context; @@ -235,16 +235,16 @@ struct operational_async_context { const char * const *attrs; }; -static int operational_async_callback(struct ldb_context *ldb, void *context, struct ldb_reply *ares) +static int operational_callback(struct ldb_context *ldb, void *context, struct ldb_reply *ares) { - struct operational_async_context *ac; + struct operational_context *ac; if (!context || !ares) { ldb_set_errstring(ldb, talloc_asprintf(ldb, "NULL Context or Result in callback")); goto error; } - ac = talloc_get_type(context, struct operational_async_context); + ac = talloc_get_type(context, struct operational_context); if (ares->type == LDB_REPLY_ENTRY) { /* for each record returned post-process to add any derived @@ -263,21 +263,21 @@ error: static int operational_search(struct ldb_module *module, struct ldb_request *req) { - struct operational_async_context *ac; + struct operational_context *ac; struct ldb_request *down_req; const char **search_attrs = NULL; int i, a, ret; - req->async.handle = NULL; + req->handle = NULL; - ac = talloc(req, struct operational_async_context); + ac = talloc(req, struct operational_context); if (ac == NULL) { return LDB_ERR_OPERATIONS_ERROR; } ac->module = module; - ac->up_context = req->async.context; - ac->up_callback = req->async.callback; + ac->up_context = req->context; + ac->up_callback = req->callback; ac->attrs = req->op.search.attrs; down_req = talloc_zero(req, struct ldb_request); @@ -325,8 +325,8 @@ static int operational_search(struct ldb_module *module, struct ldb_request *req down_req->controls = req->controls; - down_req->async.context = ac; - down_req->async.callback = operational_async_callback; + down_req->context = ac; + down_req->callback = operational_callback; ldb_set_timeout_from_prev_req(module->ldb, req, down_req); /* perform the search */ @@ -335,7 +335,7 @@ static int operational_search(struct ldb_module *module, struct ldb_request *req /* do not free down_req as the call results may be linked to it, * it will be freed when the upper level request get freed */ if (ret == LDB_SUCCESS) { - req->async.handle = down_req->async.handle; + req->handle = down_req->handle; } return ret; @@ -392,7 +392,7 @@ static int operational_add(struct ldb_module *module, struct ldb_request *req) /* do not free down_req as the call results may be linked to it, * it will be freed when the upper level request get freed */ if (ret == LDB_SUCCESS) { - req->async.handle = down_req->async.handle; + req->handle = down_req->handle; } return ret; @@ -449,7 +449,7 @@ static int operational_modify(struct ldb_module *module, struct ldb_request *req /* do not free down_req as the call results may be linked to it, * it will be freed when the upper level request get freed */ if (ret == LDB_SUCCESS) { - req->async.handle = down_req->async.handle; + req->handle = down_req->handle; } return ret; |