diff options
| author | Stefan Metzmacher <metze@samba.org> | 2014-01-15 13:17:42 +0100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2014-05-26 03:31:28 +0200 |
| commit | ae406ac6687a5c093e196741ac0187cf27a83b3d (patch) | |
| tree | 38d7a35aa32f488227566161ed452cad7643c124 /source4/librpc/rpc/dcerpc_connect.c | |
| parent | d1b5016572a3d1fe45a50015bcaf7ecb51ed6a4d (diff) | |
| download | samba-ae406ac6687a5c093e196741ac0187cf27a83b3d.tar.gz samba-ae406ac6687a5c093e196741ac0187cf27a83b3d.tar.xz samba-ae406ac6687a5c093e196741ac0187cf27a83b3d.zip | |
s4:librpc/rpc: use DCERPC_REQUEST_TIMEOUT for smb opens
There's no need to make the connect timeout dynamic.
We implicitly used SMB_REQUEST_TIMEOUT which is also 60 seconds before.
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 | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/source4/librpc/rpc/dcerpc_connect.c b/source4/librpc/rpc/dcerpc_connect.c index 88898857bf6..d9daa7dee25 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; |