diff options
| author | Nadezhda Ivanova <nadezhda.ivanova@postpath.com> | 2010-01-07 12:34:06 +0200 |
|---|---|---|
| committer | Nadezhda Ivanova <nadezhda.ivanova@postpath.com> | 2010-01-07 12:34:06 +0200 |
| commit | 309473f938d18b9993c2c4f120eeff7b4641985a (patch) | |
| tree | c07dde840efd38b75a4b196b247c11946c3b57c9 /source3/rpc_client/ndr.c | |
| parent | fb5383c69ee52fb5e6d066a43451dc8c806cc795 (diff) | |
| parent | 71a40d7e2c21bf3ac47be3ec57fb091ff420ba9a (diff) | |
| download | samba-309473f938d18b9993c2c4f120eeff7b4641985a.tar.gz samba-309473f938d18b9993c2c4f120eeff7b4641985a.tar.bz2 samba-309473f938d18b9993c2c4f120eeff7b4641985a.zip | |
Merge branch 'master' of git://git.samba.org/samba
Diffstat (limited to 'source3/rpc_client/ndr.c')
| -rw-r--r-- | source3/rpc_client/ndr.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/source3/rpc_client/ndr.c b/source3/rpc_client/ndr.c index 6433a7d196..4e8634d3b9 100644 --- a/source3/rpc_client/ndr.c +++ b/source3/rpc_client/ndr.c @@ -182,6 +182,21 @@ NTSTATUS cli_do_rpc_ndr(struct rpc_pipe_client *cli, } status = cli_do_rpc_ndr_recv(req, mem_ctx); + + /* + * NT_STATUS_IO_TIMEOUT indicates network problem, + * tear the connection apart. + */ + if (NT_STATUS_EQUAL(status, NT_STATUS_IO_TIMEOUT)) { + if (cli->transport->transport == NCACN_IP_TCP || + cli->transport->transport == NCALRPC) { + rpccli_close_sock_fd(cli); + } + + if (cli->transport->transport == NCACN_NP) { + rpccli_close_np_fd(cli); + } + } fail: TALLOC_FREE(frame); return status; |