[SCM] Samba Shared Repository - branch master updated - af9dc6381da52c686d797a54d69b486214000cb5

[Jeremy Allison]

The branch, master has been updated
       via  af9dc6381da52c686d797a54d69b486214000cb5 (commit)
      from  a9390d3047b7b7aba6f73c20e3dff292f7600a9f (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit af9dc6381da52c686d797a54d69b486214000cb5
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Oct 3 17:57:37 2008 -0700

    Fix the build farm. In this branch cli_echo returns NTSTATUS.
    Jeremy

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

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


Changeset truncated at 500 lines:

diff --git a/source3/client/client.c b/source3/client/client.c
index 4d6bf8f..eb9f31b 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -4421,9 +4421,12 @@ static void readline_callback(void)
 
 	/* Ping the server to keep the connection alive using SMBecho. */
 	{
+		NTSTATUS status;
 		unsigned char garbage[16];
 		memset(garbage, 0xf0, sizeof(garbage));
-		if (!cli_echo(cli, 1, data_blob_const(garbage, 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"));
 			finished = true;


-- 
Samba Shared Repository