diff options
| author | Volker Lendecke <vl@samba.org> | 2008-01-23 16:42:31 +0100 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2008-01-23 17:09:10 +0100 |
| commit | 7101026061c470ed962267b43ac0aa67cc761a64 (patch) | |
| tree | e773b52d2134822aa5ccf220ec7cf3af2bda3097 /source/libsmb | |
| parent | fd34ce437057bb34cdc37f4b066e424000d36789 (diff) | |
| download | samba-7101026061c470ed962267b43ac0aa67cc761a64.tar.gz samba-7101026061c470ed962267b43ac0aa67cc761a64.tar.xz samba-7101026061c470ed962267b43ac0aa67cc761a64.zip | |
read_socket_with_timeout has timeout=0 handling
Diffstat (limited to 'source/libsmb')
| -rw-r--r-- | source/libsmb/clientgen.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/source/libsmb/clientgen.c b/source/libsmb/clientgen.c index ecef293d079..042b3bdfb04 100644 --- a/source/libsmb/clientgen.c +++ b/source/libsmb/clientgen.c @@ -180,12 +180,8 @@ bool cli_receive_smb(struct cli_state *cli) ssize_t cli_receive_smb_data(struct cli_state *cli, char *buffer, size_t len) { - if (cli->timeout > 0) { - return read_socket_with_timeout(cli->fd, buffer, len, - len, cli->timeout, &cli->smb_rw_error); - } else { - return read_data(cli->fd, buffer, len, &cli->smb_rw_error); - } + return read_socket_with_timeout(cli->fd, buffer, len, len, + cli->timeout, &cli->smb_rw_error); } /**************************************************************************** |