diff options
| author | Derrell Lipman <derrell@samba.org> | 2006-09-03 00:50:34 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:39:48 -0500 |
| commit | 40665edf5e6043ad5a8f46731a79ec1d5835b62a (patch) | |
| tree | 269714d303f19434078233e8d25a5428348c7827 /source3/libsmb/clientgen.c | |
| parent | fea5d59b8411244b31df7980bdcdab9ed20dc712 (diff) | |
| download | samba-40665edf5e6043ad5a8f46731a79ec1d5835b62a.tar.gz samba-40665edf5e6043ad5a8f46731a79ec1d5835b62a.tar.bz2 samba-40665edf5e6043ad5a8f46731a79ec1d5835b62a.zip | |
r18011: Should fix bug 3835.
Jeremy: requires your eyes...
If the remote connection timed out while cli_list() was retrieving its list of
files, the error was not returned to the user, e.g. via smbc_opendir(), so the
user didn't have a way to know to set the timeout longer and try again. This
problem would occur when a very large directory is being read with a too-small
timeout on the cli.
Jeremy, although there were a couple of areas that needed to be handled, I
needed to make one change that you should bless, in libsmb/clientgen.c. It
was setting
cli->smb_rw_error = smb_read_error;
but smb_read_error is zero, so this had no effect. I'm now doing
cli->smb_rw_error = READ_TIMEOUT;
instead, and according to the OP, these (cumulative) changes (in a slightly
different form) solve the problem.
Please confirm this smb_rw_error change will have no other adverse effects
that you can see.
Derrell
(This used to be commit fa664b24b829f973156486896575c1007b6d7b01)
Diffstat (limited to 'source3/libsmb/clientgen.c')
| -rw-r--r-- | source3/libsmb/clientgen.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c index 4608d40d46..3a84a5bd4d 100644 --- a/source3/libsmb/clientgen.c +++ b/source3/libsmb/clientgen.c @@ -79,7 +79,6 @@ static BOOL client_receive_smb(int fd,char *buffer, unsigned int timeout) BOOL cli_receive_smb(struct cli_state *cli) { - extern int smb_read_error; BOOL ret; /* fd == -1 causes segfaults -- Tom (tom@ninja.nl) */ @@ -107,9 +106,9 @@ BOOL cli_receive_smb(struct cli_state *cli) } /* If the server is not responding, note that now */ - if (!ret) { - cli->smb_rw_error = smb_read_error; + DEBUG(0, ("Receiving SMB: Server stopped responding\n")); + cli->smb_rw_error = READ_TIMEOUT; close(cli->fd); cli->fd = -1; return ret; |