diff options
| author | Stefan Metzmacher <metze@samba.org> | 2017-05-15 22:49:09 +0200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2017-05-21 21:05:13 +0200 |
| commit | 2c3e99d1697b83f7dd498596a274fe2e8e96116d (patch) | |
| tree | c477d74943d3e0d775eeb5ac5190d35c9872726c /source4/librpc/rpc/dcerpc_connect.c | |
| parent | 2c4e21cd6ed3a09a1d4ddf8c5d2c12748dc9f449 (diff) | |
| download | samba-2c3e99d1697b83f7dd498596a274fe2e8e96116d.tar.gz | |
s4:librpc: simplify dcerpc_connect_timeout_handler() logic
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source4/librpc/rpc/dcerpc_connect.c')
| -rw-r--r-- | source4/librpc/rpc/dcerpc_connect.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/source4/librpc/rpc/dcerpc_connect.c b/source4/librpc/rpc/dcerpc_connect.c index 8ed12578e21..723e657c70a 100644 --- a/source4/librpc/rpc/dcerpc_connect.c +++ b/source4/librpc/rpc/dcerpc_connect.c @@ -1004,12 +1004,7 @@ static void dcerpc_connect_timeout_handler(struct tevent_context *ev, struct tev { struct composite_context *c = talloc_get_type_abort(private_data, struct composite_context); - 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 { - s->pipe->timed_out = true; - } + composite_error(c, NT_STATUS_IO_TIMEOUT); } /* @@ -1053,9 +1048,6 @@ _PUBLIC_ struct composite_context* dcerpc_pipe_connect_b_send(TALLOC_CTX *parent s->credentials = credentials; s->lp_ctx = lp_ctx; - s->pipe->timed_out = false; - s->pipe->inhibit_timeout_processing = false; - tevent_add_timer(c->event_ctx, c, timeval_current_ofs(DCERPC_REQUEST_TIMEOUT, 0), dcerpc_connect_timeout_handler, c); |