diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-11 14:44:10 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-11 14:44:10 +0200 |
| commit | 6a78e56277799672b7ac187c57e546836e136f79 (patch) | |
| tree | 87f0336cb1908d01690b74c56a44f4713559b5bc /source3/lib/async_sock.c | |
| parent | ddbddbd80c80b872cdd36a01f9a3a6bc2eca1b1f (diff) | |
| parent | f0a27064869871806343648de3b5a0667118872f (diff) | |
| download | samba-6a78e56277799672b7ac187c57e546836e136f79.tar.gz samba-6a78e56277799672b7ac187c57e546836e136f79.tar.bz2 samba-6a78e56277799672b7ac187c57e546836e136f79.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into arc4
Diffstat (limited to 'source3/lib/async_sock.c')
| -rw-r--r-- | source3/lib/async_sock.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source3/lib/async_sock.c b/source3/lib/async_sock.c index 1a4c27ba20..ffba6de832 100644 --- a/source3/lib/async_sock.c +++ b/source3/lib/async_sock.c @@ -658,12 +658,13 @@ struct async_req *async_connect(TALLOC_CTX *mem_ctx, struct event_context *ev, state->fde = event_add_fd(ev, state, fd, EVENT_FD_READ | EVENT_FD_WRITE, - async_connect_callback, state); + async_connect_callback, result); if (state->fde == NULL) { sys_fcntl_long(fd, F_SETFL, p->old_sockflags); TALLOC_FREE(result); return NULL; } + result->private_data = state; state->param.param_connect.fd = fd; state->param.param_connect.address = address; |