sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-02 00:22:11 +03:00
Code Activity

r13609: Get in the initial work on making ldb async

Browse Source 
Currently only ldb_ildap is async, the plan
is to first make all backend support the async calls,
and then remove the sync functions from backends and
keep the only in the API.

Modules will need to be transformed along the way.

Simo
(This used to be commit 1e2c13b2d5)
This commit is contained in:
Simo Sorce
2006-02-22 01:31:35 +00:00
committed by Gerald (Jerry) Carter
parent f490434c0f
commit 00fe70e5b9
17 changed files with 875 additions and 362 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
source4/ldap_server/ldap_backend.c
View File

@ -44,44 +44,6 @@ static int map_ldb_error(struct ldb_context *ldb, int err, const char **errstrin
return err;
}
/*
map controls
*/
static int get_ldb_controls(void *mem_ctx, struct ldap_Control **controls, struct ldb_control ***lcontrols)
{
struct ldb_control **lctrl;
int i, l;
if (controls == NULL || controls[0] == NULL) {
*lcontrols = NULL;
return LDB_SUCCESS;
}
l = 0;
lctrl = NULL;
*lcontrols = NULL;
for (i = 0; controls[i] != NULL; i++) {
lctrl = talloc_realloc(mem_ctx, lctrl, struct ldb_control *, l + 2);
if (lctrl == NULL) {
return LDB_ERR_OTHER;
}
lctrl[l] = talloc(lctrl, struct ldb_control);
if (lctrl[l] == NULL) {
return LDB_ERR_OTHER;
}
lctrl[l]->oid = controls[i]->oid;
lctrl[l]->critical = controls[i]->critical;
lctrl[l]->data = controls[i]->value;
l++;
}
lctrl[l] = NULL;
*lcontrols = lctrl;
return LDB_SUCCESS;
}
/*
connect to the sam database
*/
@ -217,14 +179,7 @@ static NTSTATUS ldapsrv_SearchRequest(struct ldapsrv_call *call)
lreq.op.search.tree = req->tree;
lreq.op.search.attrs = attrs;
ldb_ret = get_ldb_controls(local_ctx, call->request->controls, &lreq.controls);
if (ldb_ret != LDB_SUCCESS) {
/* get_ldb_controls fails only on a critical internal error or when
* a control is defined as critical but it is not supported
*/
goto reply;
}
lreq.controls = call->request->controls;
ldb_ret = ldb_request(samdb, &lreq);
@ -281,7 +236,7 @@ reply:
errstr = ldb_errstring(samdb);
}
if (res->controls) {
done_r->msg->controls = (struct ldap_Control **)(res->controls);
done_r->msg->controls = res->controls;
talloc_steal(done_r, res->controls);
}
} else {