diff options
Diffstat (limited to 'source4/dsdb/samdb/ldb_modules/rootdse.c')
-rw-r--r-- | source4/dsdb/samdb/ldb_modules/rootdse.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/rootdse.c b/source4/dsdb/samdb/ldb_modules/rootdse.c index 01421d2817..efb3d9a05f 100644 --- a/source4/dsdb/samdb/ldb_modules/rootdse.c +++ b/source4/dsdb/samdb/ldb_modules/rootdse.c @@ -139,7 +139,7 @@ failed: handle search requests */ -struct rootdse_async_context { +struct rootdse_context { struct ldb_module *module; void *up_context; int (*up_callback)(struct ldb_context *, void *, struct ldb_reply *); @@ -147,16 +147,16 @@ struct rootdse_async_context { const char * const * attrs; }; -static int rootdse_async_callback(struct ldb_context *ldb, void *context, struct ldb_reply *ares) +static int rootdse_callback(struct ldb_context *ldb, void *context, struct ldb_reply *ares) { - struct rootdse_async_context *ac; + struct rootdse_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 rootdse_async_context); + ac = talloc_get_type(context, struct rootdse_context); if (ares->type == LDB_REPLY_ENTRY) { /* for each record returned post-process to add any dynamic @@ -175,7 +175,7 @@ error: static int rootdse_search(struct ldb_module *module, struct ldb_request *req) { - struct rootdse_async_context *ac; + struct rootdse_context *ac; struct ldb_request *down_req; int ret; @@ -185,14 +185,14 @@ static int rootdse_search(struct ldb_module *module, struct ldb_request *req) return ldb_next_request(module, req); } - ac = talloc(req, struct rootdse_async_context); + ac = talloc(req, struct rootdse_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); @@ -213,8 +213,8 @@ static int rootdse_search(struct ldb_module *module, struct ldb_request *req) down_req->op.search.attrs = req->op.search.attrs; down_req->controls = req->controls; - down_req->async.context = ac; - down_req->async.callback = rootdse_async_callback; + down_req->context = ac; + down_req->callback = rootdse_callback; ldb_set_timeout_from_prev_req(module->ldb, req, down_req); /* perform the search */ @@ -223,7 +223,7 @@ static int rootdse_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; |