The branch, master has been updated
via 1fdc96e Fix bug #8139 - smbclient fails if server does not support
Echo request.
from 56d5cb9 s3-winbind: don't try to do clever thing if the username is
not found while authenticating through winbind
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 1fdc96ecaff8ca12e9aa0082527468ad4242a8a9
Author: Jeremy Allison <[email protected]>
Date: Mon Jan 30 14:13:47 2012 -0800
Fix bug #8139 - smbclient fails if server does not support Echo request.
Based on work by Matthias Scheler <[email protected]>
Autobuild-User: Jeremy Allison <[email protected]>
Autobuild-Date: Tue Jan 31 00:47:19 CET 2012 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
source3/client/client.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/client/client.c b/source3/client/client.c
index 4b7df92..9b36ff7 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -5032,11 +5032,15 @@ 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_IS_OK(status)) {
+ 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)) {
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). */
}
}
--
Samba Shared Repository
