diff options
| author | Volker Lendecke <vl@samba.org> | 2008-01-25 23:54:22 +0100 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2008-02-02 11:03:23 +0100 |
| commit | 88c27f83d449fa20cba47cbf0a5dbaedc99859d8 (patch) | |
| tree | c4ccbf8a59835c893a0d3da176d5d968bcf7c459 /source3/client | |
| parent | 6ddfa6ae7734ffdd26ac38478c27cc9d646ddadd (diff) | |
| download | samba-88c27f83d449fa20cba47cbf0a5dbaedc99859d8.tar.gz samba-88c27f83d449fa20cba47cbf0a5dbaedc99859d8.tar.bz2 samba-88c27f83d449fa20cba47cbf0a5dbaedc99859d8.zip | |
Convert receive_smb_raw to NTSTATUS
(This used to be commit ba771bd858602452a9e58c3aab1336f2ac8a25ef)
Diffstat (limited to 'source3/client')
| -rw-r--r-- | source3/client/client.c | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/source3/client/client.c b/source3/client/client.c index c934310491..1c85a6dafc 100644 --- a/source3/client/client.c +++ b/source3/client/client.c @@ -4422,9 +4422,30 @@ static void readline_callback(void) session keepalives and then drop them here. */ if (FD_ISSET(cli->fd,&fds)) { - if (receive_smb_raw(cli->fd,cli->inbuf,0,0,&cli->smb_rw_error) == -1) { - DEBUG(0, ("Read from server failed, maybe it closed the " - "connection\n")); + NTSTATUS status; + size_t len; + + set_smb_read_error(&cli->smb_rw_error, SMB_READ_OK); + + status = receive_smb_raw(cli->fd, cli->inbuf, 0, 0, &len); + + if (!NT_STATUS_IS_OK(status)) { + DEBUG(0, ("Read from server failed, maybe it closed " + "the connection\n")); + + if (NT_STATUS_EQUAL(status, NT_STATUS_END_OF_FILE)) { + set_smb_read_error(&cli->smb_rw_error, + SMB_READ_EOF); + return; + } + + if (NT_STATUS_EQUAL(status, NT_STATUS_IO_TIMEOUT)) { + set_smb_read_error(&cli->smb_rw_error, + SMB_READ_TIMEOUT); + return; + } + + set_smb_read_error(&cli->smb_rw_error, SMB_READ_ERROR); return; } if(CVAL(cli->inbuf,0) != SMBkeepalive) { |