diff options
| author | Jeremy Allison <jra@samba.org> | 2009-04-01 09:16:41 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2009-04-01 09:16:41 -0700 |
| commit | eaddcfef1ba553744ae9293feaf7585ec9aaa0db (patch) | |
| tree | 1bfc22bf1e98b279ccf45af0ed065b9afd21fd98 /libcli/cldap/cldap.c | |
| parent | 1e742660bf3fed39b7efa2502d88ee6415522385 (diff) | |
| parent | 264b28ec0962c355ee90f9ac67fcf07cd84c5c7b (diff) | |
| download | samba-eaddcfef1ba553744ae9293feaf7585ec9aaa0db.tar.gz samba-eaddcfef1ba553744ae9293feaf7585ec9aaa0db.tar.bz2 samba-eaddcfef1ba553744ae9293feaf7585ec9aaa0db.zip | |
Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
Diffstat (limited to 'libcli/cldap/cldap.c')
| -rw-r--r-- | libcli/cldap/cldap.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/libcli/cldap/cldap.c b/libcli/cldap/cldap.c index 561ae8037c..d3fb0bb1e9 100644 --- a/libcli/cldap/cldap.c +++ b/libcli/cldap/cldap.c @@ -510,6 +510,10 @@ static void cldap_reply_state_destroy(struct tevent_req *req) static int cldap_search_state_destructor(struct cldap_search_state *s) { if (s->caller.cldap) { + if (s->message_id != -1) { + idr_remove(s->caller.cldap->searches.idr, s->message_id); + s->message_id = -1; + } DLIST_REMOVE(s->caller.cldap->searches.list, s); cldap_recvfrom_stop(s->caller.cldap); ZERO_STRUCT(s->caller); @@ -542,8 +546,12 @@ struct tevent_req *cldap_search_send(TALLOC_CTX *mem_ctx, if (!req) { return NULL; } + ZERO_STRUCTP(state); state->req = req; state->caller.cldap = cldap; + state->message_id = -1; + + talloc_set_destructor(state, cldap_search_state_destructor); if (io->in.dest_address) { if (cldap->connected) { @@ -634,7 +642,6 @@ struct tevent_req *cldap_search_send(TALLOC_CTX *mem_ctx, tevent_req_set_callback(subreq, cldap_search_state_queue_done, req); DLIST_ADD_END(cldap->searches.list, state, struct cldap_search_state *); - talloc_set_destructor(state, cldap_search_state_destructor); return req; |