[SCM] Samba Shared Repository - branch v3-5-test updated

[Karolin Seeger]

The branch, v3-5-test has been updated
       via  461adc6 s3:client: ignore SMBecho errors (the server may not support it) (bug #8139) Signed-off-by: Jeremy Allison <jra at samba.org> (cherry picked from commit bb28a9387d3c76f6f8c7f79ec61d37a499d6c8f6)
      from  3394bbf s3-libsmb Do not limit read replies to NBT packet sizes

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test


- Log -----------------------------------------------------------------
commit 461adc665aaadc730d7705b3785d45f787f98425
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Jan 31 10:02:18 2012 -0800

    s3:client: ignore SMBecho errors (the server may not support it) (bug #8139) Signed-off-by: Jeremy Allison <jra at samba.org>
    (cherry picked from commit bb28a9387d3c76f6f8c7f79ec61d37a499d6c8f6)

-----------------------------------------------------------------------

Summary of changes:
 source3/client/client.c |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/client/client.c b/source3/client/client.c
index cf43171..189b632 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -4482,9 +4482,13 @@ static void readline_callback(void)
 		memset(garbage, 0xf0, sizeof(garbage));
 		status = cli_echo(cli, 1, data_blob_const(garbage, sizeof(garbage)));
 
-		if (!NT_STATUS_IS_OK(status)) {
-			DEBUG(0, ("SMBecho failed. Maybe server has closed "
-				"the connection\n"));
+		if (NT_STATUS_IS_OK(status)) {
+			return;
+		}
+
+		if (!cli_state_is_connected(cli)) {
+			DEBUG(0, ("SMBecho failed (%s). The connection is "
+				"disconnected now\n", nt_errstr(status)));
 			finished = true;
 			smb_readline_done();
 		}


-- 
Samba Shared Repository