diff options
| author | Stefan Metzmacher <metze@samba.org> | 2012-01-31 08:41:07 +0100 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2012-01-31 21:53:25 +0100 |
| commit | 27c686dd70daf6a565c83c037e1ced09212cfff6 (patch) | |
| tree | 1795d6419bab83c73bfa902da9f17cac0acb2e5e | |
| parent | 507872f90f0df364cc758b1df6b29f46806c9671 (diff) | |
| download | samba-27c686dd70daf6a565c83c037e1ced09212cfff6.tar.gz samba-27c686dd70daf6a565c83c037e1ced09212cfff6.tar.bz2 samba-27c686dd70daf6a565c83c037e1ced09212cfff6.zip | |
Revert "Fix bug #8139 - smbclient fails if server does not support Echo request."
This reverts commit 1fdc96ecaff8ca12e9aa0082527468ad4242a8a9.
This is wrong in master as the error codes are different compared to
3.5.x. The correct way to handle this is to call cli_state_is_connected().
metze
| -rw-r--r-- | source3/client/client.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/source3/client/client.c b/source3/client/client.c index 9b36ff7098..4b7df92877 100644 --- a/source3/client/client.c +++ b/source3/client/client.c @@ -5032,15 +5032,11 @@ static void readline_callback(void) /* Ping the server to keep the connection alive using SMBecho. */ memset(garbage, 0xf0, sizeof(garbage)); status = cli_echo(cli, 1, data_blob_const(garbage, sizeof(garbage))); - if (NT_STATUS_EQUAL(status, NT_STATUS_PIPE_BROKEN) || - NT_STATUS_EQUAL(status, NT_STATUS_END_OF_FILE) || - NT_STATUS_EQUAL(status, NT_STATUS_IO_TIMEOUT)) { + if (!NT_STATUS_IS_OK(status)) { DEBUG(0, ("SMBecho failed (%s). Maybe server has closed " "the connection\n", nt_errstr(status))); finished = true; smb_readline_done(); - /* Ignore all other errors - sometimes servers simply - don't implement SMBecho (Apple for example). */ } } |