diff options
| author | Andrew Tridgell <tridge@samba.org> | 2009-09-19 08:23:03 -0700 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2009-09-19 08:23:03 -0700 |
| commit | 92786aebf1b8aa17612ebaf5dd0ee8cd4abf9616 (patch) | |
| tree | fdb5fc1bc3ed91981f045d9fed508ccd96bdc65d /source4/lib/socket/connect_multi.c | |
| parent | 7c542406b192cd72c40778850d92771974d6466c (diff) | |
| download | samba-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/lib/socket/connect_multi.c')
| -rw-r--r-- | source4/lib/socket/connect_multi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/lib/socket/connect_multi.c b/source4/lib/socket/connect_multi.c index 8fcfc0a8ea..68386ba565 100644 --- a/source4/lib/socket/connect_multi.c +++ b/source4/lib/socket/connect_multi.c @@ -103,7 +103,7 @@ _PUBLIC_ struct composite_context *socket_connect_multi_send( struct nbt_name name; struct composite_context *creq; make_nbt_name_server(&name, server_address); - creq = resolve_name_send(resolve_ctx, &name, result->event_ctx); + creq = resolve_name_send(resolve_ctx, multi, &name, result->event_ctx); if (composite_nomem(creq, result)) goto failed; composite_continue(result, creq, continue_resolve_name, result); return result; |