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 | a925a53f61ebdc6b4386b7c0853f2f87cbe2e166 (patch) | |
| tree | 115ee6eb8c3ad08b2ef877ccda6cac49d351374c /source3/libsmb/clientgen.c | |
| parent | 587cf54c61c9f1f7bcae431a82035fd942716c32 (diff) | |
| download | samba-a925a53f61ebdc6b4386b7c0853f2f87cbe2e166.tar.gz samba-a925a53f61ebdc6b4386b7c0853f2f87cbe2e166.tar.bz2 samba-a925a53f61ebdc6b4386b7c0853f2f87cbe2e166.zip | |
read_socket_with_timeout has timeout=0 handling
(This used to be commit 7101026061c470ed962267b43ac0aa67cc761a64)
Diffstat (limited to 'source3/libsmb/clientgen.c')
| -rw-r--r-- | source3/libsmb/clientgen.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c index ecef293d07..042b3bdfb0 100644 --- a/source3/libsmb/clientgen.c +++ b/source3/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); } /**************************************************************************** |