diff options
| -rw-r--r-- | source4/librpc/rpc/dcerpc_connect.c | 12 | ||||
| -rw-r--r-- | source4/librpc/rpc/dcerpc_smb.c | 12 |
2 files changed, 8 insertions, 16 deletions
diff --git a/source4/librpc/rpc/dcerpc_connect.c b/source4/librpc/rpc/dcerpc_connect.c index 88898857bf..d9daa7dee2 100644 --- a/source4/librpc/rpc/dcerpc_connect.c +++ b/source4/librpc/rpc/dcerpc_connect.c @@ -84,7 +84,6 @@ static void continue_smb_connect(struct composite_context *ctx) struct smbXcli_conn *conn; struct smbXcli_session *session; struct smbXcli_tcon *tcon; - uint32_t timeout_msec; /* receive result of smb connect request */ c->status = smb_composite_connect_recv(ctx, s->io.conn); @@ -102,12 +101,11 @@ static void continue_smb_connect(struct composite_context *ctx) session = t->session->smbXcli; tcon = t->smbXcli; smb1cli_tcon_set_id(tcon, t->tid); - timeout_msec = t->session->transport->options.request_timeout * 1000; /* send named pipe open request */ open_ctx = dcerpc_pipe_open_smb_send(s->io.conn, - conn, session, - tcon, timeout_msec, + conn, session, tcon, + DCERPC_REQUEST_TIMEOUT * 1000, s->io.pipe_name); if (composite_nomem(open_ctx, c)) return; @@ -229,7 +227,6 @@ static void continue_smb2_connect(struct tevent_req *subreq) struct smbXcli_conn *conn; struct smbXcli_session *session; struct smbXcli_tcon *tcon; - uint32_t timeout_msec; /* receive result of smb2 connect request */ c->status = smb2_connect_recv(subreq, s->io.conn, &t); @@ -246,12 +243,11 @@ static void continue_smb2_connect(struct tevent_req *subreq) conn = t->session->transport->conn; session = t->session->smbXcli; tcon = t->smbXcli; - timeout_msec = t->session->transport->options.request_timeout * 1000; /* send named pipe open request */ open_req = dcerpc_pipe_open_smb_send(s->io.conn, - conn, session, - tcon, timeout_msec, + conn, session, tcon, + DCERPC_REQUEST_TIMEOUT * 1000, s->io.pipe_name); if (composite_nomem(open_req, c)) return; diff --git a/source4/librpc/rpc/dcerpc_smb.c b/source4/librpc/rpc/dcerpc_smb.c index 9b40ecac30..b20b154a1c 100644 --- a/source4/librpc/rpc/dcerpc_smb.c +++ b/source4/librpc/rpc/dcerpc_smb.c @@ -192,14 +192,12 @@ _PUBLIC_ NTSTATUS dcerpc_pipe_open_smb(struct dcerpc_pipe *p, struct smbXcli_conn *conn; struct smbXcli_session *session; struct smbXcli_tcon *tcon; - uint32_t timeout_msec; struct composite_context *ctx; conn = t->session->transport->conn; session = t->session->smbXcli; tcon = t->smbXcli; smb1cli_tcon_set_id(tcon, t->tid); - timeout_msec = t->session->transport->options.request_timeout * 1000; /* if we don't have a binding on this pipe yet, then create one */ if (p->binding == NULL) { @@ -221,8 +219,8 @@ _PUBLIC_ NTSTATUS dcerpc_pipe_open_smb(struct dcerpc_pipe *p, } ctx = dcerpc_pipe_open_smb_send(p->conn, - conn, session, - tcon, timeout_msec, + conn, session, tcon, + DCERPC_REQUEST_TIMEOUT * 1000, pipe_name); if (ctx == NULL) { return NT_STATUS_NO_MEMORY; @@ -238,13 +236,11 @@ _PUBLIC_ NTSTATUS dcerpc_pipe_open_smb2(struct dcerpc_pipe *p, struct smbXcli_conn *conn; struct smbXcli_session *session; struct smbXcli_tcon *tcon; - uint32_t timeout_msec; struct composite_context *ctx; conn = t->session->transport->conn; session = t->session->smbXcli; tcon = t->smbXcli; - timeout_msec = t->session->transport->options.request_timeout * 1000; /* if we don't have a binding on this pipe yet, then create one */ if (p->binding == NULL) { @@ -266,8 +262,8 @@ _PUBLIC_ NTSTATUS dcerpc_pipe_open_smb2(struct dcerpc_pipe *p, } ctx = dcerpc_pipe_open_smb_send(p->conn, - conn, session, - tcon, timeout_msec, + conn, session, tcon, + DCERPC_REQUEST_TIMEOUT * 1000, pipe_name); if (ctx == NULL) { return NT_STATUS_NO_MEMORY; |