s4-librpc: Fix private context for dcerpc_connect_timeout_handler
authorAndrew Bartlett <abartlet@samba.org>
Sun, 29 Jul 2012 10:37:39 +0000 (20:37 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Sun, 29 Jul 2012 12:54:32 +0000 (14:54 +0200)
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

source4/librpc/rpc/dcerpc_connect.c

index 821499e9ffaeae4be25961333d47130869f665ee..280b7aeb0e5ba10af15958e5042a4dd5caebf9eb 100644 (file)
@@ -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: {