diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-07-29 20:37:39 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-07-29 14:54:32 +0200 |
| commit | fc6d7bfbe7511159b8854f5c0174c05f892ee88a (patch) | |
| tree | 5d41ca9f11bde1a9356e18b5178dd6afec676250 /source4/librpc/rpc | |
| parent | 1547d5fe003461c99238909d804973fc2659c847 (diff) | |
| download | samba-fc6d7bfbe7511159b8854f5c0174c05f892ee88a.tar.gz samba-fc6d7bfbe7511159b8854f5c0174c05f892ee88a.tar.bz2 samba-fc6d7bfbe7511159b8854f5c0174c05f892ee88a.zip | |
s4-librpc: Fix private context for dcerpc_connect_timeout_handler
This was incorrect in 02a356ea775a3ba589cb50af3c861ab86aaffa0b.
Andrew Bartlett
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Sun Jul 29 14:54:33 CEST 2012 on sn-devel-104
Diffstat (limited to 'source4/librpc/rpc')
| -rw-r--r-- | source4/librpc/rpc/dcerpc_connect.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/librpc/rpc/dcerpc_connect.c b/source4/librpc/rpc/dcerpc_connect.c index 821499e9ff..280b7aeb0e 100644 --- a/source4/librpc/rpc/dcerpc_connect.c +++ b/source4/librpc/rpc/dcerpc_connect.c @@ -716,9 +716,9 @@ static void continue_pipe_auth(struct composite_context *ctx) static void dcerpc_connect_timeout_handler(struct tevent_context *ev, struct tevent_timer *te, struct timeval t, void *private_data) { - struct composite_context *c = talloc_get_type(private_data, + struct composite_context *c = talloc_get_type_abort(private_data, struct composite_context); - struct pipe_connect_state *s = talloc_get_type(c->private_data, struct pipe_connect_state); + struct pipe_connect_state *s = talloc_get_type_abort(c->private_data, struct pipe_connect_state); if (!s->pipe->inhibit_timeout_processing) { composite_error(c, NT_STATUS_IO_TIMEOUT); } else { @@ -766,9 +766,9 @@ _PUBLIC_ struct composite_context* dcerpc_pipe_connect_b_send(TALLOC_CTX *parent s->pipe->timed_out = false; s->pipe->inhibit_timeout_processing = false; - tevent_add_timer(c->event_ctx, s, + tevent_add_timer(c->event_ctx, c, timeval_current_ofs(DCERPC_REQUEST_TIMEOUT, 0), - dcerpc_connect_timeout_handler, s); + dcerpc_connect_timeout_handler, c); switch (s->binding->transport) { case NCA_UNKNOWN: { |