summaryrefslogtreecommitdiff
path: root/source4/libcli/smb_composite
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2009-09-19 08:23:03 -0700
committerAndrew Tridgell <tridge@samba.org>2009-09-19 08:23:03 -0700
commit92786aebf1b8aa17612ebaf5dd0ee8cd4abf9616 (patch)
treefdb5fc1bc3ed91981f045d9fed508ccd96bdc65d /source4/libcli/smb_composite
parent7c542406b192cd72c40778850d92771974d6466c (diff)
downloadsamba-92786aebf1b8aa17612ebaf5dd0ee8cd4abf9616.tar.gz
samba-92786aebf1b8aa17612ebaf5dd0ee8cd4abf9616.tar.bz2
samba-92786aebf1b8aa17612ebaf5dd0ee8cd4abf9616.zip
s4-resolve: fixed a crash bug on timeout
We were creating the name resolution context as a child of lp_ctx, which meant when we gave up on a connection the timer on name resolution kept running, and when it timed out the callback crashed as the socket was already removed.
Diffstat (limited to 'source4/libcli/smb_composite')
-rw-r--r--source4/libcli/smb_composite/connect.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/libcli/smb_composite/connect.c b/source4/libcli/smb_composite/connect.c
index 9a19771bc0..3d35018acb 100644
--- a/source4/libcli/smb_composite/connect.c
+++ b/source4/libcli/smb_composite/connect.c
@@ -480,7 +480,7 @@ struct composite_context *smb_composite_connect_send(struct smb_composite_connec
state->stage = CONNECT_RESOLVE;
make_nbt_name_server(&name, io->in.dest_host);
- state->creq = resolve_name_send(resolve_ctx, &name, c->event_ctx);
+ state->creq = resolve_name_send(resolve_ctx, state, &name, c->event_ctx);
if (state->creq == NULL) goto failed;
state->creq->async.private_data = c;