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

tldap: Don't fire off more than one read_ldap request during searches

Browse Source
This commit is contained in:
Volker Lendecke
2009-06-27 22:28:47 +02:00
parent 79c299f96f
commit 53b9a24ce3
1 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
source3/lib/tldap.c
View File

@ -591,20 +591,32 @@ static void tldap_msg_received(struct tevent_req *subreq)
ev = state->ev; ev = state->ev;
talloc_set_destructor(req, NULL); talloc_set_destructor(req, NULL);
tldap_msg_destructor(req); tldap_msg_unset_pending(req);
num_pending = talloc_array_length(ld->pending);
tevent_req_done(req); tevent_req_done(req);
done: done:
if (talloc_array_length(ld->pending) > 0) { if (num_pending == 0) {
state = tevent_req_data(ld->pending[0], return;
struct tldap_msg_state);
subreq = read_ldap_send(ld->pending, state->ev, ld->fd);
if (subreq == NULL) {
status = TLDAP_NO_MEMORY;
goto fail;
}
tevent_req_set_callback(subreq, tldap_msg_received, ld);
} }
if (talloc_array_length(ld->pending) > num_pending) {
/*
* The callback functions called from tevent_req_done() above
* have put something on the pending queue. We don't have to
* trigger the read_ldap_send(), tldap_msg_set_pending() has
* done it for us already.
*/
return;
}
state = tevent_req_data(ld->pending[0], struct tldap_msg_state);
subreq = read_ldap_send(ld->pending, state->ev, ld->fd);
if (subreq == NULL) {
status = TLDAP_NO_MEMORY;
goto fail;
}
tevent_req_set_callback(subreq, tldap_msg_received, ld);
return; return;
fail: fail: