diff options
| author | Bo Yang <boyang@samba.org> | 2010-01-06 12:13:35 +0800 |
|---|---|---|
| committer | Bo Yang <boyang@samba.org> | 2010-01-06 19:19:35 +0800 |
| commit | 36493bf2f6634b84c57107bcb86bcbf3e82e80fc (patch) | |
| tree | 3cb21abc0fca7550f7a4b6185769a84217e9b0d2 /source3/rpc_client/ndr.c | |
| parent | da41f23bdad1ea3a1a49110217cfde3efcde5075 (diff) | |
| download | samba-36493bf2f6634b84c57107bcb86bcbf3e82e80fc.tar.gz samba-36493bf2f6634b84c57107bcb86bcbf3e82e80fc.tar.bz2 samba-36493bf2f6634b84c57107bcb86bcbf3e82e80fc.zip | |
s3: Fix infinite loop in NCACN_IP_TCP asa there is no timeout. Assume lsa_pipe_tcp is ok but network is down, then send request is ok, but select() on writeable fds loops forever since there is no response.
Signed-off-by: Bo Yang <boyang@samba.org>
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; |